Merge branch 'state-removal'

Author: Moderocky

src/main/java/org/byteskript/skript/api/DataStore.java

@@ -10,11 +10,11 @@ public interface DataStore {
 
     <Thing> Thing retrieve(String identifier, Class<Thing> type);
 
-    void store(String identifier, Object thing, Class<?> type);
-    
     default void store(String identifier, Object thing) {
         if (thing == null) store(identifier, null, void.class);
         else store(identifier, thing, thing.getClass());
     }
 
+    void store(String identifier, Object thing, Class<?> type);
+    
 }

src/main/java/org/byteskript/skript/api/Library.java

@@ -23,8 +23,6 @@ public interface Library {
 
     Collection<PropertyHandler> getProperties();
 
-    SyntaxElement[] getSyntax();
-    
     LanguageElement[] getConstructs();
 
     Type[] getTypes();
@@ -42,4 +40,6 @@ default Document[] generateDocumentation() {
         return documents.toArray(new Document[0]);
     }
 
+    SyntaxElement[] getSyntax();
+    
 }

src/main/java/org/byteskript/skript/api/ModifiableLibrary.java

@@ -33,49 +33,48 @@ public void registerSyntax(State state, SyntaxElement... elements) {
         }
     }
 
-    public void registerSyntax(State state, SyntaxElement element) {
-        this.syntax.putIfAbsent(state, new ArrayList<>());
-        this.syntax.get(state).add(element);
-    }
-    
-    
     public void registerEvents(EventHolder... events) {
         for (EventHolder event : events) {
             this.registerEvent(event);
         }
     }
 
-    public void registerEvent(EventHolder event) {
-        this.registerSyntax(CompileState.ROOT, event);
-        this.registerValues(event);
-    }
-    
     public void registerProperty(PropertyHandler handler) {
         this.properties.add(handler);
     }
 
-    public void registerProperty(String name, HandlerType type, Method handler) {
-        this.properties.add(new PropertyHandler(type, handler, name));
-    }
-    
     public void registerTypes(Class<?>... classes) {
         for (Class<?> aClass : classes) {
             this.registerType(aClass);
         }
     }
 
-    public void registerTypes(Type... types) {
-        for (Type type : types) {
-            if (!this.types.contains(type)) this.types.add(type);
-        }
-    }
-    
     public Type registerType(Class<?> cls) {
         final Type type = new Type(cls);
         if (!types.contains(type)) this.types.add(type);
         return type;
     }
 
+    public void registerSyntax(State state, SyntaxElement element) {
+        this.syntax.putIfAbsent(state, new ArrayList<>());
+        this.syntax.get(state).add(element);
+    }
+    
+    public void registerEvent(EventHolder event) {
+        this.registerSyntax(CompileState.ROOT, event);
+        this.registerValues(event);
+    }
+    
+    public void registerProperty(String name, HandlerType type, Method handler) {
+        this.properties.add(new PropertyHandler(type, handler, name));
+    }
+    
+    public void registerTypes(Type... types) {
+        for (Type type : types) {
+            if (!this.types.contains(type)) this.types.add(type);
+        }
+    }
+    
     public Type registerType(String classPath) {
         final Type type = new Type(classPath);
         if (!types.contains(type)) this.types.add(type);
@@ -103,15 +102,6 @@ public Collection<PropertyHandler> getProperties() {
         return properties;
     }
 
-    @Override
-    public SyntaxElement[] getSyntax() {
-        final List<SyntaxElement> elements = new ArrayList<>();
-        for (List<SyntaxElement> value : syntax.values()) {
-            elements.addAll(value);
-        }
-        return elements.toArray(new SyntaxElement[0]);
-    }
-    
     @Override
     public LanguageElement[] getConstructs() {
         return new LanguageElement[0];
@@ -126,4 +116,13 @@ public Type[] getTypes() {
     public Collection<PostCompileClass> getRuntime() {
         return Collections.emptyList();
     }
+    
+    @Override
+    public SyntaxElement[] getSyntax() {
+        final List<SyntaxElement> elements = new ArrayList<>();
+        for (List<SyntaxElement> value : syntax.values()) {
+            elements.addAll(value);
+        }
+        return elements.toArray(new SyntaxElement[0]);
+    }
 }

src/main/java/org/byteskript/skript/api/PropertyHandler.java

@@ -17,25 +17,25 @@ public PropertyHandler(HandlerType type, Method method, String name) {
         this(name, type, createHolder(method), createValue(type, method), method);
     }
 
-    private static Type createValue(HandlerType type, Method method) {
-        if (type.expectInputs()) {
+    private static Type createHolder(Method method) {
+        if (Modifier.isStatic(method.getModifiers())) {
             final Class<?>[] classes = method.getParameterTypes();
             assert classes.length > 0;
-            return new Type(classes[classes.length - 1]);
-        } else if (type.expectReturn()) {
-            return new Type(method.getReturnType());
+            return new Type(classes[0]);
         } else {
-            return new Type(void.class);
+            return new Type(method.getDeclaringClass());
         }
     }
 
-    private static Type createHolder(Method method) {
-        if (Modifier.isStatic(method.getModifiers())) {
+    private static Type createValue(HandlerType type, Method method) {
+        if (type.expectInputs()) {
             final Class<?>[] classes = method.getParameterTypes();
             assert classes.length > 0;
-            return new Type(classes[0]);
+            return new Type(classes[classes.length - 1]);
+        } else if (type.expectReturn()) {
+            return new Type(method.getReturnType());
         } else {
-            return new Type(method.getDeclaringClass());
+            return new Type(void.class);
         }
     }
 

src/main/java/org/byteskript/skript/api/SyntaxAnnotationUnwrapper.java

@@ -74,6 +74,14 @@ default void generateSyntaxFrom(Class<?> owner) {
         }
     }
 
+    Type registerType(Class<?> cls);
+    
+    void registerEvent(EventHolder event);
+    
+    void registerSyntax(State state, SyntaxElement element);
+    
+    void registerProperty(String name, HandlerType type, Method handler);
+    
     default void registerValues(EventHolder event) {
         for (Method method : event.eventClass().getMethods()) {
             final EventValue value = method.getAnnotation(EventValue.class);
@@ -87,12 +95,4 @@ default void registerValues(EventHolder event) {
             }
         }
     }
-    
-    Type registerType(Class<?> cls);
-    
-    void registerSyntax(State state, SyntaxElement element);
-    
-    void registerEvent(EventHolder event);
-    
-    void registerProperty(String name, HandlerType type, Method handler);
 }

src/main/java/org/byteskript/skript/api/SyntaxElement.java

@@ -27,42 +27,14 @@
 
 public interface SyntaxElement {
 
-    Pattern getPattern();
-    
     default Pattern.Match match(String thing, Context context) {
         return getPattern().match(thing, context);
     }
 
-    String[] getPatterns();
+    Pattern getPattern();
 
     Library getProvider();
 
-    LanguageElement getType();
-    
-    default Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-    
-    default String name() {
-        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
-        if (documentation == null) return getPattern().name();
-        return documentation.name();
-    }
-    
-    default String description() {
-        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
-        if (documentation == null) return "None.";
-        return documentation.description();
-    }
-    
-    default String[] examples() {
-        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
-        if (documentation == null) return new String[0];
-        return documentation.examples();
-    }
-    
-    boolean hasHandler(HandlerType type);
-    
     Method getHandler(HandlerType type);
 
     void setHandler(HandlerType type, Method method);
@@ -86,6 +58,12 @@ default boolean allowAsInputFor(Type type) {
         return type.equals(CommonTypes.OBJECT) || type.equals(getReturnType());
     }
 
+    boolean hasHandler(HandlerType type);
+    
+    default Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+    
     default void preCompile(Context context, Pattern.Match match) throws Throwable {
         // Very few elements require a lookahead.
     }
@@ -96,12 +74,6 @@ default boolean allowedIn(State state, Context context) {
         return true;
     }
 
-    class Handlers extends HashMap<HandlerType, Method> {
-        
-        public static final Handlers EMPTY = new Handlers();
-        
-    }
-    
     default boolean isDelay() {
         return false;
     }
@@ -184,4 +156,32 @@ default Document createDocument() {
         return new Document(name(), getType().name(), getPatterns(), description(), examples());
     }
 
+    default String name() {
+        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
+        if (documentation == null) return getPattern().name();
+        return documentation.name();
+    }
+    
+    LanguageElement getType();
+    
+    String[] getPatterns();
+    
+    default String description() {
+        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
+        if (documentation == null) return "None.";
+        return documentation.description();
+    }
+    
+    default String[] examples() {
+        final Documentation documentation = this.getClass().getAnnotation(Documentation.class);
+        if (documentation == null) return new String[0];
+        return documentation.examples();
+    }
+    
+    class Handlers extends HashMap<HandlerType, Method> {
+        
+        public static final Handlers EMPTY = new Handlers();
+        
+    }
+    
 }

src/main/java/org/byteskript/skript/api/automatic/GeneratedEntryNode.java

@@ -28,13 +28,6 @@ public GeneratedEntryNode(Library provider, final RecordComponent target, String
         this.target = target;
     }
 
-    @Override
-    public boolean allowedIn(State state, Context context) {
-        return super.allowedIn(state, context)
-            && context.getSection().handler() instanceof GeneratedEntrySection section
-            && section.getTarget() == target.getDeclaringRecord();
-    }
-    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree tree = context.getCompileCurrent().nested()[0];
@@ -55,4 +48,11 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         context.setState(CompileState.AREA_BODY);
     }
 
+    @Override
+    public boolean allowedIn(State state, Context context) {
+        return super.allowedIn(state, context)
+            && context.getSection().handler() instanceof GeneratedEntrySection section
+            && section.getTarget() == target.getDeclaringRecord();
+    }
+    
 }

src/main/java/org/byteskript/skript/api/automatic/GeneratedExpression.java

@@ -28,6 +28,11 @@ public GeneratedExpression(Library provider, final Method target, String... patt
         this.value = new Type(target.getReturnType());
     }
 
+    @Override
+    public Type getReturnType() {
+        return value;
+    }
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
@@ -36,9 +41,4 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         context.setState(CompileState.STATEMENT);
     }
 
-    @Override
-    public Type getReturnType() {
-        return value;
-    }
-    
 }

src/main/java/org/byteskript/skript/api/syntax/Effect.java

@@ -31,6 +31,11 @@ public CompileState getSubState() {
         return CompileState.STATEMENT; // looking for expressions here
     }
 
+    @Override
+    public boolean allowAsInputFor(Type type) {
+        return true; // support meta-effects
+    }
+    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final Method target = handlers.get(StandardHandlers.RUN);
@@ -54,9 +59,4 @@ public boolean allowedIn(State state, Context context) {
         return state == CompileState.CODE_BODY && context.hasCurrentUnit();
     }
 
-    @Override
-    public boolean allowAsInputFor(Type type) {
-        return true; // support meta-effects
-    }
-    
 }

src/main/java/org/byteskript/skript/api/syntax/Element.java

@@ -17,10 +17,10 @@
 
 public abstract class Element implements SyntaxElement {
 
-    private final Pattern pattern;
     protected final Library provider;
     protected final LanguageElement type;
     protected final Handlers handlers = new Handlers();
+    private final Pattern pattern;
 
     public Element(final Library provider, final LanguageElement type, final String... patterns) {
         this.pattern = new Pattern(Arrays.copyOf(patterns, patterns.length), provider);
@@ -53,13 +53,13 @@ public boolean hasHandler(HandlerType type) {
     }
 
     @Override
-    public void setHandler(HandlerType type, Method method) {
-        this.handlers.put(type, method);
+    public Method getHandler(HandlerType type) {
+        return handlers.get(type);
     }
 
     @Override
-    public Method getHandler(HandlerType type) {
-        return handlers.get(type);
+    public void setHandler(HandlerType type, Method method) {
+        this.handlers.put(type, method);
     }
 
 }