WIP: 変数宣言＋初期化周りの修正。BNFに残タスクあり。

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

Hide file tree

Showing 12 changed files with 2,374 additions and 1,946 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,53 @@
+{
+    // IntelliSense を使用して利用可能な属性を学べます。
+    // 既存の属性の説明をホバーして表示します。
+    // 詳細情報は次を確認してください: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Debug (Launch) with test.ksp",
+            "projectName": "KSPSyntaxParser",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopOnEntry": false,
+            "classPaths": [
+                "./lib/args4j.jar",
+                "./eclipse_compiled/"
+            ],
+            "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
+            "args": "--source ./.temp/test.ksp"
+        },
+        {
+            "type": "java",
+            "name": "Debug (Launch) with test.ksp (Parse)",
+            "projectName": "KSPSyntaxParser",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopOnEntry": false,
+            "classPaths": [
+                "./lib/args4j.jar",
+                "./eclipse_compiled/"
+            ],
+            "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
+            "args": "--source ./.temp/test.ksp --parseonly"
+        },
+        {
+            "type": "java",
+            "name": "Debug (Launch) with Arguments Prompt",
+            "projectName": "KSPSyntaxParser",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopOnEntry": false,
+            "classPaths": [
+                "./lib/args4j.jar",
+                "./eclipse_compiled/"
+            ],
+            "mainClass": "net.rkoubou.kspparser.KSPSyntaxParser",
+            "args": "${command:SpecifyProgramArgs}"
+        }
+    ]
+}
diff --git a/src/java/net/rkoubou/kspparser/analyzer/BasicEvaluationAnalyzerTemplate.java b/src/java/net/rkoubou/kspparser/analyzer/BasicEvaluationAnalyzerTemplate.java
@@ -207,7 +207,7 @@ public Object visit( ASTStrAdd node, Object data )
             Node p = node.jjtGetParent();
             while( p != null )
             {
-                if( p.getId() == JJTVARIABLEDECLARATOR )
+                if( p.getId() == JJTVARIABLEINITIALIZER )
                 {
                     MessageManager.printlnE( MessageManager.PROPERTY_ERROR_SEMANTIC_VARIABLE_INVALID_INITIALIZER_STRINGADD, node.symbol );
                     AnalyzeErrorCounter.e();