Permalink
Browse files

Finished exposing object inheritance. Site-deploy works with localhost.

  • Loading branch information...
LadyCailin committed Oct 8, 2016
1 parent fdcf556 commit 34be2183a00c338bac8f2eb35ba2518a5f3042d3
Showing with 17,020 additions and 13,459 deletions.
  1. +535 −0 hs_err_pid18246.log
  2. BIN persistence.db
  3. +5 −5 src/main/java/com/laytonsmith/PureUtilities/ClassLoading/Annotations/CacheAnnotations.java
  4. +925 −946 src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassDiscovery.java
  5. +545 −525 src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassMirror/ClassMirror.java
  6. +21 −8 src/main/java/com/laytonsmith/PureUtilities/Common/Annotations/AnnotationChecks.java
  7. +3 −3 src/main/java/com/laytonsmith/PureUtilities/Common/Annotations/ForceImplementation.java
  8. +6 −4 ...tives/interfaces/TypeofRunnerFor.java → PureUtilities/Common/Annotations/InterfaceRunnerFor.java}
  9. +252 −251 src/main/java/com/laytonsmith/PureUtilities/Common/ClassUtils.java
  10. +363 −355 src/main/java/com/laytonsmith/PureUtilities/Common/ReflectionUtils.java
  11. +943 −914 src/main/java/com/laytonsmith/PureUtilities/Common/StringUtils.java
  12. +30 −8 src/main/java/com/laytonsmith/PureUtilities/SSHWrapper.java
  13. +28 −4 src/main/java/com/laytonsmith/core/Main.java
  14. +1,983 −1,853 src/main/java/com/laytonsmith/core/MethodScriptCompiler.java
  15. +2 −2 src/main/java/com/laytonsmith/core/Profiles.java
  16. +115 −93 src/main/java/com/laytonsmith/core/compiler/Keyword.java
  17. +47 −41 src/main/java/com/laytonsmith/core/compiler/KeywordList.java
  18. +49 −24 src/main/java/com/laytonsmith/core/compiler/ProcedureDefinition.java
  19. +35 −11 src/main/java/com/laytonsmith/core/compiler/ProcedureUsage.java
  20. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/AsKeyword.java
  21. +17 −4 src/main/java/com/laytonsmith/core/compiler/keywords/AutoKeyword.java
  22. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/BindKeyword.java
  23. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/CaseKeyword.java
  24. +20 −8 src/main/java/com/laytonsmith/core/compiler/keywords/CatchKeyword.java
  25. +36 −26 src/main/java/com/laytonsmith/core/compiler/keywords/ClosureKeyword.java
  26. +17 −4 src/main/java/com/laytonsmith/core/compiler/keywords/DefaultKeyword.java
  27. +40 −27 src/main/java/com/laytonsmith/core/compiler/keywords/DoKeyword.java
  28. +29 −7 src/main/java/com/laytonsmith/core/compiler/keywords/ElseKeyword.java
  29. +11 −4 src/main/java/com/laytonsmith/core/compiler/keywords/FalseKeyword.java
  30. +21 −8 src/main/java/com/laytonsmith/core/compiler/keywords/FinallyKeyword.java
  31. +42 −30 src/main/java/com/laytonsmith/core/compiler/keywords/ForKeyword.java
  32. +42 −30 src/main/java/com/laytonsmith/core/compiler/keywords/ForeachKeyword.java
  33. +40 −27 src/main/java/com/laytonsmith/core/compiler/keywords/IClosureKeyword.java
  34. +94 −80 src/main/java/com/laytonsmith/core/compiler/keywords/IfKeyword.java
  35. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/InKeyword.java
  36. +32 −20 src/main/java/com/laytonsmith/core/compiler/keywords/InstanceofKeyword.java
  37. +5 −0 src/main/java/com/laytonsmith/core/compiler/keywords/LiteralKeyword.java
  38. +33 −21 src/main/java/com/laytonsmith/core/compiler/keywords/NotInstanceofKeyword.java
  39. +11 −4 src/main/java/com/laytonsmith/core/compiler/keywords/NullKeyword.java
  40. +53 −41 src/main/java/com/laytonsmith/core/compiler/keywords/ProcKeyword.java
  41. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/SwitchKeyword.java
  42. +11 −4 src/main/java/com/laytonsmith/core/compiler/keywords/TrueKeyword.java
  43. +100 −89 src/main/java/com/laytonsmith/core/compiler/keywords/TryKeyword.java
  44. +16 −4 src/main/java/com/laytonsmith/core/compiler/keywords/WhileKeyword.java
  45. +730 −715 src/main/java/com/laytonsmith/core/constructs/CArray.java
  46. +28 −5 src/main/java/com/laytonsmith/core/constructs/CBareString.java
  47. +103 −92 src/main/java/com/laytonsmith/core/constructs/CBoolean.java
  48. +39 −17 src/main/java/com/laytonsmith/core/constructs/CBrace.java
  49. +39 −17 src/main/java/com/laytonsmith/core/constructs/CBracket.java
  50. +573 −522 src/main/java/com/laytonsmith/core/constructs/CByteArray.java
  51. +276 −141 src/main/java/com/laytonsmith/core/constructs/CClassType.java
  52. +171 −165 src/main/java/com/laytonsmith/core/constructs/CClosure.java
  53. +34 −27 src/main/java/com/laytonsmith/core/constructs/CDouble.java
  54. +40 −18 src/main/java/com/laytonsmith/core/constructs/CEntry.java
  55. +67 −44 src/main/java/com/laytonsmith/core/constructs/CFunction.java
  56. +111 −102 src/main/java/com/laytonsmith/core/constructs/CIClosure.java
  57. +25 −4 src/main/java/com/laytonsmith/core/constructs/CIdentifier.java
  58. +34 −26 src/main/java/com/laytonsmith/core/constructs/CInt.java
  59. +34 −12 src/main/java/com/laytonsmith/core/constructs/CKeyword.java
  60. +36 −15 src/main/java/com/laytonsmith/core/constructs/CLabel.java
  61. +71 −53 src/main/java/com/laytonsmith/core/constructs/CLock.java
  62. +145 −135 src/main/java/com/laytonsmith/core/constructs/CMutablePrimitive.java
  63. +72 −66 src/main/java/com/laytonsmith/core/constructs/CNull.java
  64. +21 −12 src/main/java/com/laytonsmith/core/constructs/CNumber.java
  65. +35 −0 src/main/java/com/laytonsmith/core/constructs/CNumberRunner.java
  66. +25 −3 src/main/java/com/laytonsmith/core/constructs/CPreIdentifier.java
  67. +21 −12 src/main/java/com/laytonsmith/core/constructs/CPrimitive.java
  68. +34 −0 src/main/java/com/laytonsmith/core/constructs/CPrimitiveRunner.java
  69. +99 −86 src/main/java/com/laytonsmith/core/constructs/CResource.java
  70. +159 −149 src/main/java/com/laytonsmith/core/constructs/CSlice.java
  71. +64 −56 src/main/java/com/laytonsmith/core/constructs/CString.java
  72. +120 −99 src/main/java/com/laytonsmith/core/constructs/CSymbol.java
  73. +66 −59 src/main/java/com/laytonsmith/core/constructs/CVoid.java
  74. +28 −8 src/main/java/com/laytonsmith/core/constructs/Command.java
  75. +437 −427 src/main/java/com/laytonsmith/core/constructs/Construct.java
  76. +78 −56 src/main/java/com/laytonsmith/core/constructs/IVariable.java
  77. +50 −26 src/main/java/com/laytonsmith/core/constructs/NativeTypeList.java
  78. +41 −16 src/main/java/com/laytonsmith/core/constructs/NewIVariable.java
  79. +1 −1 src/main/java/com/laytonsmith/core/constructs/Target.java
  80. +16 −1 src/main/java/com/laytonsmith/core/constructs/Token.java
  81. +26 −2 src/main/java/com/laytonsmith/core/constructs/Variable.java
  82. +224 −199 src/main/java/com/laytonsmith/core/exceptions/CRE/AbstractCREException.java
  83. +26 −14 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBadEntityException.java
  84. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBadEntityTypeException.java
  85. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREBindException.java
  86. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CRECastException.java
  87. +44 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CRECausedByWrapper.java
  88. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREEnchantmentException.java
  89. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREError.java
  90. +27 −16 src/main/java/com/laytonsmith/core/exceptions/CRE/CREEventException.java
  91. +25 −15 src/main/java/com/laytonsmith/core/exceptions/CRE/CREException.java
  92. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CREFormatException.java
  93. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIOException.java
  94. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIllegalArgumentException.java
  95. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIncludeException.java
  96. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREIndexOverflowException.java
  97. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInsufficientArgumentsException.java
  98. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInsufficientPermissionException.java
  99. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidPluginException.java
  100. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidProcedureException.java
  101. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREInvalidWorldException.java
  102. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CRELengthException.java
  103. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CRENotFoundException.java
  104. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CRENullPointerException.java
  105. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPlayerOfflineException.java
  106. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPluginChannelException.java
  107. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CREPluginInternalException.java
  108. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CRERangeException.java
  109. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREReadOnlyException.java
  110. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CRESQLException.java
  111. +32 −20 src/main/java/com/laytonsmith/core/exceptions/CRE/CREScoreboardException.java
  112. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CRESecurityException.java
  113. +30 −18 src/main/java/com/laytonsmith/core/exceptions/CRE/CREShellException.java
  114. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREStackOverflowError.java
  115. +46 −16 src/main/java/com/laytonsmith/core/exceptions/CRE/CREThrowable.java
  116. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREUnageableMobException.java
  117. +31 −19 src/main/java/com/laytonsmith/core/exceptions/CRE/CREUntameableMobException.java
  118. +631 −632 src/main/java/com/laytonsmith/core/extensions/ExtensionManager.java
  119. +10 −1 src/main/java/com/laytonsmith/core/functions/AbstractFunction.java
  120. +8 −8 src/main/java/com/laytonsmith/core/functions/Exceptions.java
  121. +15 −15 src/main/java/com/laytonsmith/core/functions/Reflection.java
  122. +8 −1 src/main/java/com/laytonsmith/core/functions/Scheduling.java
  123. +3 −3 src/main/java/com/laytonsmith/core/functions/StringHandling.java
  124. +8 −0 src/main/java/com/laytonsmith/core/functions/Web.java
  125. +52 −0 src/main/java/com/laytonsmith/core/natives/interfaces/AbstractMixedInterfaceRunner.java
  126. +151 −147 src/main/java/com/laytonsmith/core/natives/interfaces/ArrayAccess.java
  127. +35 −0 src/main/java/com/laytonsmith/core/natives/interfaces/ArrayAccessRunner.java
  128. +43 −8 src/main/java/com/laytonsmith/core/natives/interfaces/Mixed.java
  129. +54 −0 src/main/java/com/laytonsmith/core/natives/interfaces/MixedInterfaceRunner.java
  130. +37 −0 src/main/java/com/laytonsmith/core/natives/interfaces/MixedRunner.java
  131. +0 −22 src/main/java/com/laytonsmith/core/natives/interfaces/MixedTypeofRunner.java
  132. +34 −0 src/main/java/com/laytonsmith/core/natives/interfaces/SizableRunner.java
  133. +0 −21 src/main/java/com/laytonsmith/core/natives/interfaces/SizableTypeofRunner.java
  134. +2 −2 src/main/java/com/laytonsmith/core/natives/interfaces/{Sizable.java → Sizeable.java}
  135. +0 −16 src/main/java/com/laytonsmith/core/natives/interfaces/TypeofRunnerIface.java
  136. +10 −8 src/main/java/com/laytonsmith/persistence/PersistenceNetwork.java
  137. +29 −27 src/main/java/com/laytonsmith/persistence/SQLiteDataSource.java
  138. +619 −610 src/main/java/com/laytonsmith/tools/Interpreter.java
  139. +371 −352 src/main/java/com/laytonsmith/tools/SimpleSyntaxHighlighter.java
  140. +2 −2 src/main/java/com/laytonsmith/tools/SyntaxHighlighters.java
  141. +1 −1 src/main/java/com/laytonsmith/tools/docgen/DocGen.java
  142. +9 −9 src/main/java/com/laytonsmith/tools/docgen/DocGenExportTool.java
  143. +501 −405 src/main/java/com/laytonsmith/tools/docgen/DocGenTemplates.java
  144. +32 −30 src/main/java/com/laytonsmith/tools/docgen/ExtensionDocGen.java
  145. +230 −0 src/main/java/com/laytonsmith/tools/docgen/sitedeploy/APIBuilder.java
  146. +27 −0 src/main/java/com/laytonsmith/tools/docgen/sitedeploy/DeploymentMethod.java
  147. +54 −0 src/main/java/com/laytonsmith/tools/docgen/sitedeploy/LocalDeploymentMethod.java
  148. +29 −0 src/main/java/com/laytonsmith/tools/docgen/sitedeploy/RemoteDeploymentMethod.java
  149. +295 −163 src/main/java/com/laytonsmith/tools/docgen/{ → sitedeploy}/SiteDeploy.java
  150. +14 −0 src/main/java/com/laytonsmith/tools/docgen/templates/Logic.java
  151. +8 −8 src/main/resources/docs/Advanced_Guide
  152. +1 −1 src/main/resources/docs/Advanced_Scripts
  153. +2 −2 src/main/resources/docs/Architecture
  154. +7 −7 src/main/resources/docs/Arrays
  155. +4 −6 src/main/resources/docs/Beginner's_Guide
  156. +1 −1 src/main/resources/docs/Changelog
  157. +1 −1 src/main/resources/docs/Closures
  158. +1 −1 src/main/resources/docs/CommandLineTools
  159. +79 −0 src/main/resources/docs/Cookbook
  160. +4 −3 src/main/resources/docs/Data_Manager
  161. +3 −3 src/main/resources/docs/NewObjects
  162. +2 −2 src/main/resources/docs/Operators
  163. +40 −38 src/main/resources/docs/SQL
  164. +16 −0 src/main/resources/docs/SyntaxHighlighting
  165. +4 −0 src/main/resources/docs/Test
  166. +9 −0 src/main/resources/siteDeploy/DocDirectory
  167. +4 −74 src/main/resources/siteDeploy/FrontPage
  168. +2 −1 src/main/resources/siteDeploy/LearningTrail.json
  169. +76 −0 src/main/resources/siteDeploy/VersionFrontPage
  170. +50 −20 src/main/resources/siteDeploy/frame.html
  171. +0 −116 src/main/resources/siteDeploy/generic.html
  172. +172 −68 src/main/resources/siteDeploy/index.js
  173. +1,047 −1,047 src/main/resources/siteDeploy/resources/css/style.css
  174. +69 −6 src/main/resources/siteDeploy/resources/css/styles.css
  175. +1 −0 src/main/resources/siteDeploy/resources/css/tooltipster-sideTip-shadow.min.css
  176. +1 −0 src/main/resources/siteDeploy/resources/css/tooltipster.bundle.min.css
  177. BIN src/main/resources/siteDeploy/resources/images/favicon.ico
  178. BIN src/main/resources/siteDeploy/resources/images/gears.gif
  179. +4 −0 src/main/resources/siteDeploy/resources/js/jquery.min.js
  180. +2 −0 src/main/resources/siteDeploy/resources/js/tooltipster.bundle.min.js
  181. +13 −4 src/main/resources/siteDeploy/resources/js/wiky.js
  182. +101 −25 src/test/java/com/laytonsmith/PureUtilities/ClassLoading/GeneralTest.java
  183. +7 −0 src/test/java/com/laytonsmith/core/MethodScriptCompilerTest.java
  184. +6 −1 src/test/java/com/laytonsmith/core/OptimizationTest.java
  185. +64 −0 src/test/java/com/laytonsmith/core/constructs/TestCClassType.java
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
Binary file not shown.
@@ -12,8 +12,6 @@
import com.laytonsmith.annotations.typeof;
import com.laytonsmith.core.SimpleDocumentation;
import com.laytonsmith.core.functions.DummyFunction;
import com.laytonsmith.core.natives.interfaces.TypeofRunnerFor;
import com.laytonsmith.core.natives.interfaces.TypeofRunnerIface;
import java.io.File;
import java.io.FileOutputStream;
import java.lang.reflect.Method;
@@ -23,6 +21,8 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.laytonsmith.PureUtilities.Common.Annotations.InterfaceRunnerFor;
import com.laytonsmith.core.natives.interfaces.MixedInterfaceRunner;
/**
*
@@ -63,8 +63,8 @@ public static void main(String[] args) throws Exception {
for(Class c : apiClasses){
boolean isGetNameExempt = false;
if(c.isInterface()){
for(Class r : ClassDiscovery.getDefaultInstance().loadClassesWithAnnotation(TypeofRunnerFor.class)){
TypeofRunnerFor f = (TypeofRunnerFor) r.getAnnotation(TypeofRunnerFor.class);
for(Class r : ClassDiscovery.getDefaultInstance().loadClassesWithAnnotation(InterfaceRunnerFor.class)){
InterfaceRunnerFor f = (InterfaceRunnerFor) r.getAnnotation(InterfaceRunnerFor.class);
if(f.value() == c){
isGetNameExempt = c.getAnnotation(typeof.class) != null;
c = r;
@@ -78,7 +78,7 @@ public static void main(String[] args) throws Exception {
// Skip this one. These are excused from the normal reporting requirements.
continue;
}
if(!SimpleDocumentation.class.isAssignableFrom(c) && !TypeofRunnerIface.class.isAssignableFrom(c)){
if(!SimpleDocumentation.class.isAssignableFrom(c) && !MixedInterfaceRunner.class.isAssignableFrom(c)){
uhohs.add(c.getName() + " must implement SimpleDocumentation");
continue;
}
Oops, something went wrong.

0 comments on commit 34be218

Please sign in to comment.