Changeset 9674 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs

Timestamp:

06/29/13 18:04:06 (11 years ago)

Author:

gkronber

Message:

#2026: Worked on integration of ICSharpCode.AvalonEdit control for GPDL syntax-highlighting and error reporting.

File:

• branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs (modified) (3 diffs)

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

@@ -19 +19 @@
 
     private void compileButton_Click(object sender, EventArgs e) {
-      Utils.InstallModule("Utils", new Utils.ModuleMethodDelegate(Utils.UtilsMethod));
-      Utils.InstallModule("Sets", new Utils.ModuleMethodDelegate(Sets.SetsMethod));
-      Utils.InstallModule("Errors", new Utils.ModuleMethodDelegate(Errors.ErrorsMethod));
+      Utils.InstallModule("Utils", Utils.UtilsMethod);
+      Utils.InstallModule("Sets", Sets.SetsMethod);
+      Utils.InstallModule("Errors", Errors.ErrorsMethod);
 
-      Utils.InstallModule("GPDefLex", new Utils.ModuleMethodDelegate(GPDefLex.GPDefLexMethod));
-      Utils.InstallModule("GPDefSem", new Utils.ModuleMethodDelegate(GPDefSem.GPDefSemMethod));
-      Utils.InstallModule("GPDefSyn", new Utils.ModuleMethodDelegate(GPDefSyn.GPDefSynMethod));
+      Utils.InstallModule("GPDefLex", GPDefLex.GPDefLexMethod);
+      Utils.InstallModule("GPDefSem", GPDefSem.GPDefSemMethod);
+      Utils.InstallModule("GPDefSyn", GPDefSyn.GPDefSynMethod);
 
       // --- initialize modules ---
@@ -32 +32 @@
       Errors.PushAbortMethod(new Errors.AbortMethod(Abort));
 
-      using (var src = new StringReader(gpdlTextBox.Text)) {
+      using (var src = new StringReader(codeEditor.textEditor.Text)) {
         GPDefLex.src = src;
         GPDefSyn.Parse();
       }
 
-      GPDefLex.InitLex();
-      GPDefSyn.Interpret();
+      codeEditor.ClearErrors();
 
-      MainForm.MainFormManager.MainForm.ShowContent(GPDefSem.problem);
+      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);
+        }
+      }
     }
 
@@ -48 +63 @@
 
     void IProblemInstanceConsumer<string>.Load(string data) {
-      this.gpdlTextBox.Text = data;
+      codeEditor.textEditor.Text = data;
     }
-
   }
 }