temporary fixes of #6 (WIP)

r-koubou · Mar 23, 2018 · b26ca15 · b26ca15
1 parent 848a39b
commit b26ca15
Show file tree

Hide file tree

Showing 18 changed files with 2,092 additions and 2,279 deletions.
diff --git a/.classpath b/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="eclipse_compiled"/>
+	<classpathentry kind="output" path="classes"/>
     <classpathentry kind="lib" path="lib/args4j.jar" exported="true"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,4 @@ target/
 .temp/
 .org
 .java.org
-eclipse_compiled/
+classes/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,33 +6,33 @@
     "configurations": [
         {
             "type": "java",
-            "name": "Debug (Launch) with test.ksp",
+            "name": "Debug with test.ksp",
             "projectName": "KSPSyntaxParser",
             "request": "launch",
             "cwd": "${workspaceFolder}",
             "console": "internalConsole",
             "stopOnEntry": false,
             "classPaths": [
                 "./lib/args4j.jar",
-                "./eclipse_compiled/"
+                "./classes/"
             ],
             "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
             "args": "--source ./.temp/test.ksp"
         },
         {
             "type": "java",
-            "name": "Debug (Launch) with test.ksp (Parse)",
+            "name": "Debug with test.ksp (+Obfuscate)",
             "projectName": "KSPSyntaxParser",
             "request": "launch",
             "cwd": "${workspaceFolder}",
             "console": "internalConsole",
             "stopOnEntry": false,
             "classPaths": [
                 "./lib/args4j.jar",
-                "./eclipse_compiled/"
+                "./classes/"
             ],
             "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
-            "args": "--source ./.temp/test.ksp --parseonly"
+            "args": "--source ./.temp/test.ksp --obfuscate"
         },
         {
             "type": "java",
@@ -44,10 +44,10 @@
             "stopOnEntry": false,
             "classPaths": [
                 "./lib/args4j.jar",
-                "./eclipse_compiled/"
+                "./classes/"
             ],
             "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
             "args": "${command:SpecifyProgramArgs}"
         }
     ]
-}
+}
diff --git a/data/lang/message.properties b/data/lang/message.properties
@@ -11,9 +11,9 @@
 #
 
 #-------------------------------------------------------------------------------
-# Lexical Error
+# Syntax Error
 #-------------------------------------------------------------------------------
-error.lexical = ${level}	${line}	Syntax Error
+error.syntax = ${level}	${line}	Syntax Error
 
 #-------------------------------------------------------------------------------
 # General

diff --git a/data/lang/message_ja.properties b/data/lang/message_ja.properties
@@ -11,9 +11,9 @@
 #
 
 #-------------------------------------------------------------------------------
-# Lexical Error
+# Syntax Error
 #-------------------------------------------------------------------------------
-error.lexical = ${level}	${line}	文法エラー
+error.syntax = ${level}	${line}	文法エラー
 
 #-------------------------------------------------------------------------------
 # General

diff --git a/rebuild.sh b/rebuild.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./clean.sh && ./build.sh
diff --git a/src/java/net/rkoubou/kspparser/analyzer/MessageManager.java b/src/java/net/rkoubou/kspparser/analyzer/MessageManager.java
@@ -26,7 +26,7 @@ public class MessageManager implements AnalyzerConstants
     //--------------------------------------------------------------------------
     // Lexical
     //--------------------------------------------------------------------------
-    static public final String PROPERTY_ERROR_LEXICAL                   = "error.lexical";
+    static public final String PROPERTY_ERROR_SYNTAX                        = "error.syntax";
 
     //--------------------------------------------------------------------------
     // General
@@ -207,7 +207,7 @@ private MessageManager(){}
     static public String expand( ParseException src )
     {
         return expand(
-            PROPERTY_ERROR_LEXICAL,
+            PROPERTY_ERROR_SYNTAX,
             Level.ERROR,
             src.currentToken.beginLine,
             src.currentToken.beginColumn,