enums as field ref

Author: NeumimTo

src/main/antlr/nts.g4

@@ -55,7 +55,6 @@ rval : type_literal
      | '(' rval ')'
 
      | function_call
-     | type_enum
      | type_bool
      | variable_reference
      | type_comparison
@@ -68,8 +67,6 @@ iterable :
          | variable_reference
          ;
 
-type_enum : type=IDENTIFIER '.' value=IDENTIFIER ;
-
 function_call : function_name=IDENTIFIER arguments='('argument? (',' argument)* ')' ('as' type_cast= IDENTIFIER)?;
 
 if_statement : IF condition_expression terminator statement_list END ;
@@ -132,6 +129,7 @@ IN: I N;
 FUNCTION: ( F N | F U N C T I O N );
 
 IDENTIFIER : [a-zA-Z_][a-zA-Z0-9_]*;
+ENUM_IDENTIFIER : [A-Z_]*;
 fragment DIGIT : ('0'..'9');
 INT : [0-9]+;
 DOT : '.';

src/main/java/cz/neumimto/nts/bytecode/VisitorImpl.java

@@ -63,17 +63,27 @@ public ScriptContext visitAssignment_statement(ntsParser.Assignment_statementCon
     @Override
     public ScriptContext visitGetField_statement(ntsParser.GetField_statementContext ctx) {
         String fieldName = ctx.field.getText();
-        Variable variable = scriptContext.getVariable(ctx.fieldOwner.getText()).orElseThrow(() -> new RuntimeException("Unknown variable " + ctx.fieldOwner.getText()));
+        String fieldOwnerName = ctx.fieldOwner.getText();
+
+        Optional<Variable> variableOptional = scriptContext.getVariable(ctx.fieldOwner.getText());
+
+        if (variableOptional.isEmpty()) {
+            Enum enumValue = scriptContext.getEnumValue(fieldOwnerName, fieldName);
+            addInsn(FieldAccess.forEnumeration(new EnumerationDescription.ForLoadedEnumeration(enumValue)));
+            return scriptContext;
+        }
+
+
+        Variable variable = variableOptional.get();
         addInsn(variable.load());
-        String variableName = ctx.fieldOwner.getText();
 
         Variable c = scriptContext.currentScope().lastVariableOnStack;
 
         //when we accessing function param
         if (c == null) {
             c = scriptContext.currentScope().findVariable(ctx.fieldOwner.getText());
         }
-        Variable fieldOwner = scriptContext.getVariable(variableName).get();
+        Variable fieldOwner = scriptContext.getVariable(fieldOwnerName).get();
 
         try {
             Field field = fieldOwner.getRuntimeType().getField(fieldName);
@@ -222,8 +232,9 @@ public ScriptContext visitReturn_statement(ntsParser.Return_statementContext ctx
         var rtype = ctx.rval();
 
 
-        if (rtype.type_enum() != null || rtype.type_literal() != null) {
+        if (rtype.getField_statement() != null || rtype.type_literal() != null) {
             visitChildren(rtype);
+            //todo enum or field rimirive from field
             addInsn(MethodReturn.REFERENCE);
 
         } else if (rtype.type_bool() != null) {
@@ -239,15 +250,6 @@ public ScriptContext visitReturn_statement(ntsParser.Return_statementContext ctx
         return scriptContext;
     }
 
-    @Override
-    public ScriptContext visitType_enum(ntsParser.Type_enumContext ctx) {
-        String type = ctx.type.getText();
-        String value = ctx.value.getText();
-        Enum enumValue = scriptContext.getEnumValue(type, value);
-        addInsn(FieldAccess.forEnumeration(new EnumerationDescription.ForLoadedEnumeration(enumValue)));
-        return scriptContext;
-    }
-
     @Override
     public ScriptContext visitFunction_call(ntsParser.Function_callContext ctx) {
         String line = ctx.getText();

src/main/java/cz/neumimto/nts/nts.interp

@@ -30,8 +30,9 @@ FOREACH=29
 IN=30
 FUNCTION=31
 IDENTIFIER=32
-INT=33
-DOT=34
+ENUM_IDENTIFIER=33
+INT=34
+DOT=35
 'as'=1
 '('=2
 ')'=3
@@ -48,4 +49,4 @@ DOT=34
 '!='=21
 '>'=24
 '<'=25
-'.'=34
+'.'=35

src/main/java/cz/neumimto/nts/nts.tokens

@@ -191,18 +191,6 @@ public class ntsBaseListener implements ntsListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitIterable(ntsParser.IterableContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterType_enum(ntsParser.Type_enumContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitType_enum(ntsParser.Type_enumContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/cz/neumimto/nts/ntsBaseListener.java

@@ -116,13 +116,6 @@ public class ntsBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements nt
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitIterable(ntsParser.IterableContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitType_enum(ntsParser.Type_enumContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *