Modify index even when dealing with terminal symbols to fix bugs of i…

…ndex
Matts966 · Feb 10, 2020 · 3d0f190 · 3d0f190
1 parent e9ff9a5
commit 3d0f190
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/examples/typescript/while-lang/WhileLanguage.ts b/examples/typescript/while-lang/WhileLanguage.ts
@@ -378,7 +378,7 @@ export class DefaultVisitor implements Visitor {
 		process.stdout.write(" ")
 		process.stdout.write("assign")
 		process.stdout.write(" ")
-		host.arg1.accept(this)
+		host.arg2.accept(this)
 	}
 	visitSkip(host : Skip) {
 		process.stdout.write("skip")

diff --git a/src/GenerateTypeScript.hs b/src/GenerateTypeScript.hs
@@ -133,17 +133,15 @@ tellASTDefinitions = do
     forM_ (syntaxRules syntax nt) $ \rule -> do
       let className = pascalCase (ruleName rule)
       tellsLn $ "\tvisit" ++ className ++ "(host : " ++ className ++ ") {"
-
-
       _ <- (`execStateT` 0) $ forMWithSep_ (tellsLn $ "\t\tprocess.stdout.write(\" \")") (zip [1 ..] (ruleRhs rule)) $ \(i, sym) -> case sym of
         NonTerminalSymbol nt -> do
           j <- modify (\c -> c + 1) >> get
           tellsLn $ "\t\thost.arg" ++ show j ++ ".accept(this)"
-
         TerminalSymbol t -> do
           if 0 < (length $ terminalParams t)
           then
             forMWithSep_ (tellsLn $ "\t\tprocess.stdout.write(\" \")") (zip [1 ..] (terminalParams t)) $ \(k, param) -> do
+              modify (\c -> c + 1)
               tellsLn $ "\t\tprocess.stdout.write(\"\"+host.arg" ++ show k ++ ")"
           else
             tellsLn $ "\t\tprocess.stdout.write(\"" ++ (terminalName t) ++ "\")"