Преглед изворни кода

adapted the code to the recent changes in FoxParser

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8552 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova пре 6 година
родитељ
комит
fa9699d303
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 4 4
      source/FoxInterpreter.Mod
  2. 1 1
      source/InterpreterShell.Mod

+ 4 - 4
source/FoxInterpreter.Mod

@@ -60,13 +60,13 @@ TYPE
 		PROCEDURE Statement*(statements: SyntaxTree.StatementSequence; outer: SyntaxTree.Statement): BOOLEAN;
 		VAR statement: SyntaxTree.Statement;
 		BEGIN
-			IF (Token() = Scanner.ExclamationMark) THEN
+			IF (Symbol() = Scanner.ExclamationMark) THEN
 				statement := Cmd();
 				IF statement # NIL THEN 
 					statements.AddStatement(statement);
 				END;
 				RETURN TRUE
-			ELSIF (Token() = Scanner.Questionmark) THEN
+			ELSIF (Symbol() = Scanner.Questionmark) THEN
 				statement := Print();
 				IF statement # NIL THEN 
 					statements.AddStatement(statement);
@@ -80,7 +80,7 @@ TYPE
 		PROCEDURE Cmd(): SyntaxTree.Statement;
 		VAR cmd: CommandStatement; string: Strings.String;
 		BEGIN
-			NextSymbol;
+			NextToken;
 			IF MandatoryString(string) THEN
 			NEW(cmd, string);
 			(* TRACE(string^) *)
@@ -91,7 +91,7 @@ TYPE
 		PROCEDURE Print(): SyntaxTree.Statement;
 		VAR print: PrintStatement;
 		BEGIN
-			NextSymbol;
+			NextToken;
 			NEW(print, Expression());
 			RETURN print;
 		END Print;

+ 1 - 1
source/InterpreterShell.Mod

@@ -853,7 +853,7 @@ TYPE
 						context.out.Update;
 					END;
 					IF parser.error THEN parser.Reset END;
-					parser.NextSymbol;
+					parser.NextToken;
 					(*NEW(scanner, "",r, 0, diagnostics);
 					NEW(parser, scanner, diagnostics, ""); (* silent *)*)
 				END;