Merge pull request #5 from OGL-Development/1.0

1.0

Author: NoSharp

.idea/misc.xml

@@ -50,12 +50,6 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

pom.xml

@@ -10,10 +10,11 @@ public class Main {
 
 
     public static void main(String[] args){
-        String path = System.getProperty("user.dir") + "/src/main/java/org/luapp/language/test.lpp";
+        String path = args[0];//System.getProperty("user.dir") + "/src/main/java/org/luapp/language/test.lpp";
         Main.luaPPInstance = new Luapp(path);
         Main.luaPPInstance.load();
     }
+
     public static String readPath(String path){
         try {
             File myObj = new File(path);

src/main/java/org/luapp/language/Main.java

@@ -64,18 +64,19 @@ T__62=63
 T__63=64
 T__64=65
 T__65=66
-NAME=67
-NORMALSTRING=68
-CHARSTRING=69
-LONGSTRING=70
-INT=71
-HEX=72
-FLOAT=73
-HEX_FLOAT=74
-COMMENT=75
-LINE_COMMENT=76
-WS=77
-SHEBANG=78
+T__66=67
+NAME=68
+NORMALSTRING=69
+CHARSTRING=70
+LONGSTRING=71
+INT=72
+HEX=73
+FLOAT=74
+HEX_FLOAT=75
+COMMENT=76
+LINE_COMMENT=77
+WS=78
+SHEBANG=79
 ';'=1
 '='=2
 'break'=3
@@ -96,49 +97,50 @@ SHEBANG=78
 'class'=18
 'extends'=19
 'local'=20
-'return'=21
-'::'=22
-'.'=23
-':'=24
-'nil'=25
-'false'=26
-'true'=27
-'...'=28
-'('=29
-')'=30
-'['=31
-']'=32
-'{'=33
-'}'=34
-'or'=35
-'and'=36
-'<'=37
-'>'=38
-'<='=39
-'>='=40
-'~='=41
-'=='=42
-'..'=43
-'+'=44
-'-'=45
-'*'=46
-'/'=47
-'%'=48
-'//'=49
-'&'=50
-'|'=51
-'~'=52
-'<<'=53
-'>>'=54
-'not'=55
-'#'=56
-'^'=57
-'new'=58
-'get'=59
-'set'=60
-'constructor'=61
-'++'=62
-'+='=63
-'*='=64
-'/='=65
-'-='=66
+'safe'=21
+'return'=22
+'::'=23
+'.'=24
+':'=25
+'nil'=26
+'false'=27
+'true'=28
+'...'=29
+'('=30
+')'=31
+'['=32
+']'=33
+'{'=34
+'}'=35
+'or'=36
+'and'=37
+'<'=38
+'>'=39
+'<='=40
+'>='=41
+'~='=42
+'=='=43
+'..'=44
+'+'=45
+'-'=46
+'*'=47
+'/'=48
+'%'=49
+'//'=50
+'&'=51
+'|'=52
+'~'=53
+'<<'=54
+'>>'=55
+'not'=56
+'#'=57
+'^'=58
+'new'=59
+'get'=60
+'set'=61
+'constructor'=62
+'++'=63
+'+='=64
+'*='=65
+'/='=66
+'-='=67

src/main/java/org/luapp/language/generator/luapp.interp

@@ -1,4 +1,4 @@
-// Generated from C:/Users/Harry/Desktop/Lua/lpp/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
+// Generated from C:/Users/Harry/Desktop/Lua/lua-plus-plus/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
 package org.luapp.language.generator;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -611,6 +611,18 @@ public class luappBaseListener implements luappListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitMinusEqual(luappParser.MinusEqualContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSafeOperator(luappParser.SafeOperatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSafeOperator(luappParser.SafeOperatorContext ctx) { }
 
 	/**
 	 * {@inheritDoc}

src/main/java/org/luapp/language/generator/luapp.tokens

@@ -1,4 +1,4 @@
-// Generated from C:/Users/Harry/Desktop/Lua/lpp/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
+// Generated from C:/Users/Harry/Desktop/Lua/lua-plus-plus/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
 package org.luapp.language.generator;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
@@ -361,4 +361,11 @@ public class luappBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitMinusEqual(luappParser.MinusEqualContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitSafeOperator(luappParser.SafeOperatorContext ctx) { return visitChildren(ctx); }
 }