Compiler/lexical analyzer: Difference between revisions

Content added Content deleted

Inline

@@ Line 6,322: / Line 6,322: @@
 type
   TokenKind* = enum
     tokMult = "Op_multiply", tokDiv = "Op_divide", tokMod = "Op_mod",
@@ Line 6,337: / Line 6,338: @@
     tokString = "String"
     tokEnd = "End_of_input"
   Token* = object
     ln*, col*: int
@@ Line 6,345: / Line 6,347: @@
     of tokString: stringVal*: string
     else: discard
   Lexer* = object
     input: string
     pos: int
     ln, col: int
   LexicalError* = object of CatchableError
     ln*, col*: int
@@ Line 6,420: / Line 6,424: @@
   of '>':
     next()
-    if current() == '=': result = Token(kind: tokGreaterEq)
+    if current() == '=':
-    else: result = Token(kind: tokGreater)
+      result = Token(kind: tokGreaterEq)
+      next()
+    else:
+      result = Token(kind: tokGreater)
   of '=':
     next()
-    if current() == '=': result = Token(kind: tokEq)
+    if current() == '=':
-    else: result = Token(kind: tokAssign)
+      result = Token(kind: tokEq)
+      next()
+    else:
+      result = Token(kind: tokAssign)
   of '!':
     next()
-    if current() == '=': result = Token(kind: tokNotEq)
+    if current() == '=':
-    else: result = Token(kind: tokNot)
+      result = Token(kind: tokNotEq)
+      next()
+    else:
+      result = Token(kind: tokNot)
   of '&':
     next()
-    if current() == '&': result = Token(kind: tokAnd)
+    if current() == '&':
+      result = Token(kind: tokAnd)
-    else: lexer.error("'&&' expected")
+      next()
+    else:
+      lexer.error("'&&' expected")
   of '|':
     next()
-    if current() == '|': result = Token(kind: tokOr)
+    if current() == '|':
+      result = Token(kind: tokOr)
-    else: lexer.error("'||' expected")
+      next()
+    else:
+      lexer.error("'||' expected")
   of '(': result = Token(kind: tokLPar); next()
   of ')': result = Token(kind: tokRPar); next()