Changeset 10412

Timestamp:

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

Author:

gkronber

Message:

#2026 also support C++-style comments

Location:

branches/HeuristicLab.Problems.GPDL

Files:

• HeuristicLab.Problems.GPDL/3.4/GPDef.atg (modified) (1 diff)
• HeuristicLab.Problems.GPDL/3.4/Scanner.cs (modified) (2 diffs)
• SyntaxAnalyzer/GPDef.atg (modified) (1 diff)
• SyntaxAnalyzer/Scanner.cs (modified) (2 diffs)
• SyntaxAnalyzer/SyntaxAnalyzer.csproj (modified) (1 diff)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/GPDef.atg

@@ -37 +37 @@
   ident = letter {letter | digit}  .
 
-COMMENTS
-  FROM "/*" TO "*/" NESTED
+COMMENTS FROM "/*" TO "*/" NESTED
+COMMENTS FROM "//" TO "\r"
 
 IGNORE '\t' + '\r' + '\n'

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;

branches/HeuristicLab.Problems.GPDL/SyntaxAnalyzer/GPDef.atg

@@ -29 +29 @@
   ident = letter {letter | digit} .
 
-COMMENTS
-  FROM "/*" TO "*/" NESTED
+COMMENTS FROM "/*" TO "*/" NESTED
+COMMENTS FROM "//" TO "\r"
 
 IGNORE '\t' + '\r' + '\n'

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

@@ -306 +306 @@
     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();
@@ -357 +376 @@
       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;

branches/HeuristicLab.Problems.GPDL/SyntaxAnalyzer/SyntaxAnalyzer.csproj

@@ -62 +62 @@
 </PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+
+call GenerateFromAtg.cmd
+</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.