Changeset 10412 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Scanner.cs

Timestamp:

01/28/14 17:09:30 (10 years ago)

Author:

gkronber

Message:

#2026 also support C++-style comments

File:

• branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Scanner.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Scanner.cs

@@ -300 +300 @@
     int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos;
     NextCh();
+    if (ch == '/') {
+      NextCh();
+      for(;;) {
+        if (ch == 13) {
+          level--;
+          if (level == 0) { oldEols = line - line0; NextCh(); return true; }
+          NextCh();
+        } else if (ch == Buffer.EOF) return false;
+        else NextCh();
+      }
+    } else {
+      buffer.Pos = pos0; NextCh(); line = line0; col = col0; charPos = charPos0;
+    }
+    return false;
+  }
+
+  bool Comment1() {
+    int level = 1, pos0 = pos, line0 = line, col0 = col, charPos0 = charPos;
+    NextCh();
     if (ch == '*') {
       NextCh();
@@ -350 +369 @@
       ch >= 9 && ch <= 10 || ch == 13
     ) NextCh();
-    if (ch == '/' && Comment0()) return NextToken();
+    if (ch == '/' && Comment0() ||ch == '/' && Comment1()) return NextToken();
     int recKind = noSym;
     int recEnd = pos;