Fixes statements being duplicated in "block" parents.

Author: NoSharp

.gitignore

@@ -1,69 +1,3 @@
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
+.idea/**/**
+.idea/modules.xml
+target/**

pom.xml

@@ -19,9 +19,10 @@
         <!-- https://mvnrepository.com/artifact/org.antlr/antlr4-runtime -->
         <dependency>
             <groupId>org.antlr</groupId>
-            <artifactId>antlr-runtime</artifactId>
-            <version>3.5.2</version>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.8-1</version>
         </dependency>
+
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr</artifactId>
@@ -50,16 +51,18 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
-
+                <version>2.2-beta-5</version>
                 <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.luapp.language.Main</mainClass>
+                        </manifest>
+                    </archive>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
                 </configuration>
-
                 <executions>
                     <execution>
                         <id>make-assembly</id>
@@ -69,7 +72,6 @@
                         </goals>
                     </execution>
                 </executions>
-
             </plugin>
         </plugins>
     </build>

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

@@ -10,8 +10,10 @@ public class Main {
 
     public static String output = "";
 
+    public static boolean debug = true;
+
     public static void main(String[] args){
-        String path = args[0];
+        String path = debug ? System.getProperty("user.dir") + "/src/main/java/org/luapp/language/test.lpp" : args[0];
         Main.luaPPInstance = new Luapp(path);
         Main.luaPPInstance.load();
     }

src/main/java/org/luapp/language/handlers/StatementHandler.java

@@ -20,7 +20,8 @@ public boolean isParentClass(ParserRuleContext context){
             ParserRuleContext prc = (ParserRuleContext)parent;
             if(prc == null) return false;
             if(prc.parent == null) return false;
-            if(prc.getParent().getRuleIndex() == luappParser.RULE_classbody) {
+            if(prc.getParent().getRuleIndex() == luappParser.RULE_classbody
+                || prc.getParent().getRuleIndex() == luappParser.RULE_block) {
                 return true;
             }
             parent = prc.parent;

src/main/java/org/luapp/language/test.lpp

@@ -18,3 +18,4 @@ class cat extends animal
 end
 
 print("hello world?")
+if 1==1 then print("helloworld2") end

src/main/java/org/luapp/language/test.lua

@@ -1,7 +1,8 @@
 --[[
-Written by nosharp (https://nosharp.cc),
-tom.bat (tomdotbat.dev),
-samuel milton (smilton.dev)
+Written with Lua++.
+Don't remove this notice please
+
+https://github.com/LuaPlusPlus/lua-plus-plus
 ]]--
 cat = {}
 cat.__index = cat
@@ -36,4 +37,5 @@ end
 function cat:getType()
 	return self.type
 end
-print("hello world?")
+print("hello world?")
+if 1==1 then print("helloworld2") end