Changeset 9724 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views

Timestamp:

07/19/13 00:31:12 (11 years ago)

Author:

gkronber

Message:

#2026 changed ATG to Coco/R syntax and use Coco/R (C#) to generate scanner and parser for GPDL

Location:

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4

Files:

• CodeEditor.xaml.cs (modified) (2 diffs)
• GpdlEditor.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/CodeEditor.xaml.cs

@@ -57 +57 @@
     }
 
-    private void textEditor_MouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e) {
+    private void textEditor_MouseWheel(object sender, MouseWheelEventArgs e) {
     }
 
-    private void textEditor_KeyDown(object sender, System.Windows.Input.KeyEventArgs e) {
+    private void textEditor_KeyDown(object sender, KeyEventArgs e) {
       if (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl) controlHeld = true;
     }
@@ -70 +70 @@
     internal void SetLexError(string msg, int line, int col) {
       errorLineTransformer.MarkLexError(msg, line, col);
-      textEditor.InvalidateVisual();
+      textEditor.TextArea.TextView.Redraw();
     }
 
     internal void SetSynError(string msg, int line, int col) {
       errorLineTransformer.MarkSynError(msg, line, col);
-      textEditor.InvalidateVisual();
+      textEditor.TextArea.TextView.Redraw();
     }
 
     internal void ClearErrors() {
       errorLineTransformer.ClearErrors();
-      textEditor.InvalidateVisual();
+      textEditor.TextArea.TextView.Redraw();
     }
 

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs

@@ -2 +2 @@
 using System.IO;
 using System.Linq;
+using System.Text;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Problems.Instances;
@@ -19 +20 @@
 
     private void compileButton_Click(object sender, EventArgs e) {
-      Utils.InstallModule("Utils", Utils.UtilsMethod);
-      Utils.InstallModule("Sets", Sets.SetsMethod);
-      Utils.InstallModule("Errors", Errors.ErrorsMethod);
+      //Utils.InstallModule("Utils", Utils.UtilsMethod);
+      //Utils.InstallModule("Sets", Sets.SetsMethod);
+      //Utils.InstallModule("Errors", Errors.ErrorsMethod);
 
-      Utils.InstallModule("GPDefLex", GPDefLex.GPDefLexMethod);
-      Utils.InstallModule("GPDefSem", GPDefSem.GPDefSemMethod);
-      Utils.InstallModule("GPDefSyn", GPDefSyn.GPDefSynMethod);
+      //Utils.InstallModule("GPDefLex", GPDefLex.GPDefLexMethod);
+      //Utils.InstallModule("GPDefSem", GPDefSem.GPDefSemMethod);
+      //Utils.InstallModule("GPDefSyn", GPDefSyn.GPDefSynMethod);
 
-      // --- initialize modules ---
-      Utils.Modules(Utils.ModuleAction.initModule);
+      //// --- initialize modules ---
+      //Utils.Modules(Utils.ModuleAction.initModule);
 
-      Errors.PushAbortMethod(new Errors.AbortMethod(Abort));
+      //Errors.PushAbortMethod(new Errors.AbortMethod(Abort));
 
-      using (var src = new StringReader(codeEditor.textEditor.Text)) {
-        GPDefLex.src = src;
-        GPDefSyn.Parse();
+      using (var src = new MemoryStream(Encoding.UTF8.GetBytes(codeEditor.textEditor.Text))) {
+        Scanner scanner = new Scanner(src);
+        Parser parser = new Parser(scanner);
+        parser.Parse();
       }
 
       codeEditor.ClearErrors();
 
-      if (Errors.NumOfErrors() == 0) {
-        GPDefLex.InitLex();
-        GPDefSyn.Interpret();
+      //if (Errors.NumOfErrors() == 0) {
+      //  GPDefLex.InitLex();
+      //  GPDefSyn.Interpret();
 
-        MainForm.MainFormManager.MainForm.ShowContent(GPDefSem.problem);
-      } else {
-        int nLexErrors = Errors.NumOfLexErrors();
-        for (int i = 0; i < nLexErrors; i++) {
-          var lexErr = Errors.GetLexError(i == 0);
-          codeEditor.SetLexError(lexErr.msg, lexErr.line, lexErr.col);
-        }
-        int nSynErrors = Errors.NumOfSynErrors();
-        for (int i = 0; i < nSynErrors; i++) {
-          var synErr = Errors.GetSynError(i == 0);
-          codeEditor.SetLexError(synErr.msg, synErr.line, synErr.col);
-        }
-      }
+      //  MainForm.MainFormManager.MainForm.ShowContent(GPDefSem.problem);
+      //} else {
+      //  int nLexErrors = Errors.NumOfLexErrors();
+      //  for (int i = 0; i < nLexErrors; i++) {
+      //    var lexErr = Errors.GetLexError(i == 0);
+      //    codeEditor.SetLexError(lexErr.msg, lexErr.line, lexErr.col);
+      //  }
+      //  int nSynErrors = Errors.NumOfSynErrors();
+      //  for (int i = 0; i < nSynErrors; i++) {
+      //    var synErr = Errors.GetSynError(i == 0);
+      //    codeEditor.SetLexError(synErr.msg, synErr.line, synErr.col);
+      //  }
+      //}
     }