diff --git a/Editor/Lectures/Lecture.10.gd b/Editor/Lectures/Lecture.10.gd index 3dbea62..960dbf4 100644 --- a/Editor/Lectures/Lecture.10.gd +++ b/Editor/Lectures/Lecture.10.gd @@ -50,8 +50,8 @@ const TokenType = \ const TokenSpec = \ { # Comments - TokenType.CommentLine : "^\/\/.*", - TokenType.CommentMultiLine : "^\/\\*[\\s\\S]*?\\*\/", + TokenType.CommentLine : "^\\/\\/.*", + TokenType.CommentMultiLine : "^\\/\\*[\\s\\S]*?\\*\\/", # Formatting TokenType.Whitespace : "^\\s+", diff --git a/Editor/Lectures/Lecture.11.gd b/Editor/Lectures/Lecture.11.gd index b8b2e9c..217478e 100644 --- a/Editor/Lectures/Lecture.11.gd +++ b/Editor/Lectures/Lecture.11.gd @@ -56,8 +56,8 @@ const TokenType = \ const TokenSpec = \ { # Comments - TokenType.CommentLine : "^\/\/.*", - TokenType.CommentMultiLine : "^\/\\*[\\s\\S]*?\\*\/", + TokenType.CommentLine : "^\\/\\/.*", + TokenType.CommentMultiLine : "^\\/\\*[\\s\\S]*?\\*\\/", # Formatting TokenType.Whitespace : "^\\s+", diff --git a/Editor/Lectures/Lecture.12.gd b/Editor/Lectures/Lecture.12.gd index 57b21e7..9d6219d 100644 --- a/Editor/Lectures/Lecture.12.gd +++ b/Editor/Lectures/Lecture.12.gd @@ -57,8 +57,8 @@ const TokenType = \ const TokenSpec = \ { # Comments - TokenType.CommentLine : "^\/\/.*", - TokenType.CommentMultiLine : "^\/\\*[\\s\\S]*?\\*\/", + TokenType.CommentLine : "^\\/\\/.*", + TokenType.CommentMultiLine : "^\\/\\*[\\s\\S]*?\\*\\/", # Formatting TokenType.Whitespace : "^\\s+", @@ -68,11 +68,11 @@ const TokenSpec = \ TokenType.ExpressionPEnd : "^\\)", # Logical - TokenType.Logical_Not : "^!", TokenType.RelationalOp : "^[>\\<]=?", TokenType.EqualityOp : "^[=!]=", TokenType.Logical_And : "^&&", TokenType.Logical_Or : "^\\|\\|", + TokenType.Logical_Not : "^!", # Arithmetic TokenType.ComplexAssignment : "^[*\\/\\+\\-]=", @@ -830,51 +830,51 @@ func tout(text): const Tests = \ { - # MultiStatement = \ - # { - # Name = "Multi-Statement", - # File = "1.Multi-Statement.uf" - # }, - # BlockStatement = \ - # { - # Name = "Block Statement", - # File = "2.BlockStatement.uf" - # }, - # BinaryExpression = \ - # { - # Name = "Binary Expression", - # File = "3.BinaryExpression.uf" - # }, - # Assignment = \ - # { - # Name = "Assignment", - # File = "4.Assignment.uf" - # }, - # VaraibleDeclaration = \ - # { - # Name = "Variable Declaration", - # File = "5.VariableDeclaration.uf" - # }, - # Conditionals = \ - # { - # Name = "Conditionals", - # File = "6.Conditionals.uf" - # }, - # Relations = \ - # { - # Name = "Relations", - # File = "7.Relations.uf" - # }, - # Equality = \ - # { - # Name = "Equality", - # File = "8.Equality.uf" - # }, - # Logical = \ - # { - # Name = "Logical", - # File = "9.Logical.uf" - # }, + MultiStatement = \ + { + Name = "Multi-Statement", + File = "1.Multi-Statement.uf" + }, + BlockStatement = \ + { + Name = "Block Statement", + File = "2.BlockStatement.uf" + }, + BinaryExpression = \ + { + Name = "Binary Expression", + File = "3.BinaryExpression.uf" + }, + Assignment = \ + { + Name = "Assignment", + File = "4.Assignment.uf" + }, + VaraibleDeclaration = \ + { + Name = "Variable Declaration", + File = "5.VariableDeclaration.uf" + }, + Conditionals = \ + { + Name = "Conditionals", + File = "6.Conditionals.uf" + }, + Relations = \ + { + Name = "Relations", + File = "7.Relations.uf" + }, + Equality = \ + { + Name = "Equality", + File = "8.Equality.uf" + }, + Logical = \ + { + Name = "Logical", + File = "9.Logical.uf" + }, Unary = \ { Name = "Unary", diff --git a/Editor/Lectures/Lecture.9.gd b/Editor/Lectures/Lecture.9.gd index 051c158..917f946 100644 --- a/Editor/Lectures/Lecture.9.gd +++ b/Editor/Lectures/Lecture.9.gd @@ -45,7 +45,7 @@ const TokenSpec = \ { # Comments TokenType.CommentLine : "^\/\/.*", - TokenType.CommentMultiLine : "^\/\\*[\\s\\S]*?\\*\/", + TokenType.CommentMultiLine : "^\/\\*[\\s\\S]*?\\*\\/", # Formatting TokenType.Whitespace : "^\\s+",