syntax changes 2

Author: NeumimTo

src/main/antlr/nts.g4

@@ -1,24 +1,18 @@
-//header
-/*
-  @myVar =
-
-*/
-
 grammar nts;
 
 script : statement_list EOF;
 
 statement_list : statement terminator
-               | statement_list statement terminator
+               | statement_list terminator
                | terminator
                ;
 
 statement : assignment_statement
           | putField_statement
-          | function_call
           | return_statement
           | if_statement
           | foreach_statement
+          | function_call
           ;
 
 condition_expression : function_call
@@ -37,13 +31,13 @@ comparable_expr : type_bool
                 | function_call
                 ;
 
-variable_reference : variable=VARIABLE_IDENTIFIER ;
+variable_reference : variable=IDENTIFIER ;
 
 
 putField_statement : fieldOwner=variable_reference '.' field=IDENTIFIER '=' value=rval ;
 getField_statement : fieldOwner=variable_reference '.' field=IDENTIFIER ('as' type_cast= IDENTIFIER)?;
 
-assignment_statement : name=VARIABLE_IDENTIFIER '=' value=assignment_values ;
+assignment_statement : name=IDENTIFIER '=' value=assignment_values ;
 
 return_statement	:	RETURN value=rval	;
 
@@ -83,7 +77,7 @@ if_statement : IF condition_expression terminator statement_list END ;
 foreach_statement : FOREACH variable=variable_reference IN collection=iterable terminator statement_list END ;
 
 
-argument : name=IDENTIFIER '=' value=rval   ;
+argument : name=IDENTIFIER ':' value=rval   ;
 
 newline : CRLF;
 
@@ -138,7 +132,6 @@ IN: I N;
 FUNCTION: ( F N | F U N C T I O N );
 
 IDENTIFIER : [a-zA-Z_][a-zA-Z0-9_]*;
-VARIABLE_IDENTIFIER : '@' IDENTIFIER;
 fragment DIGIT : ('0'..'9');
 INT : [0-9]+;
 DOT : '.';

src/main/antlr/script.txt

@@ -0,0 +1,2 @@
+
+

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

@@ -277,7 +277,7 @@ private LinkedHashMap<String, Variable> getImplementingMethodParams() {
                 String value = annotation.value();
                 Class<?> type = parameter.getType();
                 MethodVariableAccess opcode = MethodVariableAccess.of(new TypeDescription.ForLoadedType(type));
-                map.put("@" + value, new Variable(i + 1, opcode, type));
+                map.put(value, new Variable(i + 1, opcode, type));
             }
         }
         return map;

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

@@ -25,7 +25,7 @@ public FnVisitor(Set<Object> context) {
     @Override
     public Object visitFunction_call(ntsParser.Function_callContext ctx) {
         String fnName = ctx.function_name.getText();
-        if (!lambdas.contains("@" + fnName)) {
+        if (!lambdas.contains(fnName)) {
             for (Object o : context) {
                 if (o instanceof Descriptor d) {
                     if (d.functionName.equalsIgnoreCase(fnName)) {
@@ -43,7 +43,7 @@ public Object visitFunction_call(ntsParser.Function_callContext ctx) {
     @Override
     public Object visitAssignment_statement(ntsParser.Assignment_statementContext ctx) {
         if (ctx.assignment_values().lambda() != null) {
-            lambdas.add(ctx.VARIABLE_IDENTIFIER().getText());
+            lambdas.add(ctx.IDENTIFIER().getText());
         }
         return super.visitAssignment_statement(ctx);
     }

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

@@ -37,7 +37,7 @@ protected StackManipulation previouusInsn() {
 
     @Override
     public ScriptContext visitAssignment_statement(ntsParser.Assignment_statementContext ctx) {
-        TerminalNode variableIdentifier = ctx.VARIABLE_IDENTIFIER();
+        TerminalNode variableIdentifier = ctx.IDENTIFIER();
         Optional<Variable> var = scriptContext.getVariable(variableIdentifier.getText());
 
         Variable variable = var.orElseGet(() -> scriptContext.createNewVariable(variableIdentifier.getText(), ctx.assignment_values()));
@@ -170,6 +170,11 @@ public ScriptContext visitType_double(ntsParser.Type_doubleContext ctx) {
         return scriptContext;
     }
 
+    @Override
+    public ScriptContext visitAssignment_values(ntsParser.Assignment_valuesContext ctx) {
+        return super.visitAssignment_values(ctx);
+    }
+
     protected boolean parseBoolean(String text) {
         if (text.equalsIgnoreCase("t") || text.equalsIgnoreCase("true")) {
             return true;
@@ -255,8 +260,12 @@ public ScriptContext visitType_enum(ntsParser.Type_enumContext ctx) {
 
     @Override
     public ScriptContext visitFunction_call(ntsParser.Function_callContext ctx) {
+        String line = ctx.getText();
+        if (ctx.arguments == null) {
+            return super.visitFunction_call(ctx);
+        }
         String functionName = ctx.function_name.getText();
-        Optional<Variable> variable = scriptContext.getVariable("@" + functionName);
+        Optional<Variable> variable = scriptContext.getVariable(functionName);
         if (variable.isPresent()) {
             Variable variable1 = variable.get();
             if (variable1.getRuntimeType() != null && Runnable.class.isAssignableFrom(variable1.getRuntimeType())) {
@@ -333,7 +342,7 @@ public ScriptContext visitFunction_call(ntsParser.Function_callContext ctx) {
                 }
             }
             if (parent != null) {
-                Variable variable1 = scriptContext.currentScope().findVariable(parent.VARIABLE_IDENTIFIER().getText());
+                Variable variable1 = scriptContext.currentScope().findVariable(parent.IDENTIFIER().getText());
                 variable1.setRuntimeType(c.getDeclaringClass());
             }
         } else {
@@ -499,7 +508,7 @@ public ScriptContext visitLambda(ntsParser.LambdaContext ctx) {
         List<ntsParser.Variable_referenceContext> variable_referenceContexts = ctx.variable_reference();
         Map<String, Variable> fnVars = new TreeMap<>();
         for (ntsParser.Variable_referenceContext var : variable_referenceContexts) {
-            String text = var.VARIABLE_IDENTIFIER().getText();
+            String text = var.IDENTIFIER().getText();
             Optional<Variable> variable = scriptContext.getVariable(text);
             if (variable.isEmpty()) {
                 throw new IllegalStateException("Unknown variable " + text);

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

@@ -2,49 +2,50 @@ T__0=1
 T__1=2
 T__2=3
 T__3=4
-LITERAL=5
-WS=6
-SL_COMMENT=7
-ASSIGN=8
-CRLF=9
-RETURN=10
-TRUE=11
-FALSE=12
-PLUS=13
-MINUS=14
-MUL=15
-DIV=16
-MOD=17
-EXP=18
-EQUAL=19
-NOT_EQUAL=20
-LESS_EQUAL=21
-GREATER_EQUAL=22
-GREATER=23
-LESS=24
-IF=25
-ELSE=26
-END=27
-FOREACH=28
-IN=29
-FUNCTION=30
-IDENTIFIER=31
-VARIABLE_IDENTIFIER=32
+T__4=5
+LITERAL=6
+WS=7
+SL_COMMENT=8
+ASSIGN=9
+CRLF=10
+RETURN=11
+TRUE=12
+FALSE=13
+PLUS=14
+MINUS=15
+MUL=16
+DIV=17
+MOD=18
+EXP=19
+EQUAL=20
+NOT_EQUAL=21
+LESS_EQUAL=22
+GREATER_EQUAL=23
+GREATER=24
+LESS=25
+IF=26
+ELSE=27
+END=28
+FOREACH=29
+IN=30
+FUNCTION=31
+IDENTIFIER=32
 INT=33
 DOT=34
 'as'=1
 '('=2
 ')'=3
 ','=4
-'='=8
-'+'=13
-'-'=14
-'*'=15
-'/'=16
-'%'=17
-'**'=18
-'=='=19
-'!='=20
-'>'=23
-'<'=24
+':'=5
+'='=9
+'+'=14
+'-'=15
+'*'=16
+'/'=17
+'%'=18
+'**'=19
+'=='=20
+'!='=21
+'>'=24
+'<'=25
 '.'=34