Merge pull request #28 from LuaPlusPlus/1.0.5

1.0.5

Author: NoSharp

.gitignore

@@ -1,3 +1,4 @@
 .idea/**/**
 .idea/modules.xml
 target/**
+.idea/vcs.xml

.idea/compiler.xml

@@ -26,6 +26,8 @@ public class Luapp {
     public String currentClass;
     public String currentAbstract;
 
+    public CommonTokenStream commonTokenStream;
+
     /**
      *
      * @param path The path to the file.
@@ -42,8 +44,8 @@ public void load(){
             this.listenerManager = new ListenerManager();
             this.listenerManager.Load();
             luappLexer lexer = new luappLexer(new ANTLRFileStream(this.path));
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            luappParser parser = new luappParser(tokens);
+            this.commonTokenStream = new CommonTokenStream(lexer);
+            luappParser parser = new luappParser(this.commonTokenStream);
             ParseTree tree = parser.chunk();
             ParseTreeWalker walker = new ParseTreeWalker();
             walker.walk(new MasterLuaPPListener(), tree);
@@ -52,7 +54,9 @@ public void load(){
             File newFile = new File(newPath);
             newFile.createNewFile();
             FileWriter writeFile = new FileWriter(newPath);
-            writeFile.write("--[[\nWritten by nosharp (https://nosharp.cc),\ntom.bat (tomdotbat.dev),\nsamuel milton (smilton.dev)\n]]--" + this.currentResult);
+            writeFile.write("--[[\nWritten with Lua++.\n" +
+                    "Don't remove this notice please\n" +
+                    "\nhttps://github.com/LuaPlusPlus/lua-plus-plus\n]]--" + this.currentResult);
             writeFile.close();
         }catch(IOException ex){
             ex.printStackTrace();
@@ -94,10 +98,9 @@ public String getRaw(){
     }
 
     public String getRawFromContext(ParserRuleContext context){
-        Token startToken = context.start;
-        Token stopToken = context.stop;
-        CharStream cs = context.start.getTokenSource().getInputStream();
-        return cs.getText(new Interval(startToken.getStartIndex(), stopToken.getStopIndex()));
+        int startToken = context.start.getStartIndex();
+        int stopToken = context.stop.getStartIndex();
+        return context.getStart().getInputStream().getText(new Interval(startToken, stopToken));
     }
 
     public void appendToResult(String target){

.idea/misc.xml

@@ -65,19 +65,18 @@ T__63=64
 T__64=65
 T__65=66
 T__66=67
-T__67=68
-NAME=69
-NORMALSTRING=70
-CHARSTRING=71
-LONGSTRING=72
-INT=73
-HEX=74
-FLOAT=75
-HEX_FLOAT=76
-COMMENT=77
-LINE_COMMENT=78
-WS=79
-SHEBANG=80
+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
@@ -136,13 +135,12 @@ SHEBANG=80
 'not'=56
 '#'=57
 '^'=58
-'new'=59
-'static'=60
-'get'=61
-'set'=62
-'constructor'=63
-'++'=64
-'+='=65
-'*='=66
-'/='=67
-'-='=68
+'static'=59
+'get'=60
+'set'=61
+'constructor'=62
+'++'=63
+'+='=64
+'*='=65
+'/='=66
+'-='=67

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

@@ -1,4 +1,4 @@
-// Generated from C:/Users/Harry/Desktop/Lua/lua-plus-plus/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
+// Generated from C:/Users/Harry/Desktop/Lua/lpp2electricboogaloo/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;
@@ -455,18 +455,6 @@ public class luappBaseListener implements luappListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitString(luappParser.StringContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNewclass(luappParser.NewclassContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNewclass(luappParser.NewclassContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

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

@@ -1,4 +1,4 @@
-// Generated from C:/Users/Harry/Desktop/Lua/lua-plus-plus/src/main/java/org/luapp/language/parser\luapp.g4 by ANTLR 4.8
+// Generated from C:/Users/Harry/Desktop/Lua/lpp2electricboogaloo/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;
 
@@ -270,13 +270,6 @@ public class luappBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitString(luappParser.StringContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitNewclass(luappParser.NewclassContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *