Changeset 8d687fe in tol

Timestamp:

Feb 13, 2012, 5:41:00 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

1053ab7

Parents:

ab6d232

Message:

fixes #994, refs #1404,

• using tol::checksyntax
• before invoking tol::checksyntax it is changed the cwd to the directory containing the file checked

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4126 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib/toltk

Files:

• bystext.tcl (modified) (1 diff)
• editor.tcl (modified) (1 diff)

tolbase/lib/toltk/bystext.tcl

@@ -795 +795 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-proc ::BayesText::TolSyntaxCheck {editor} {
+proc ::BayesText::TolSyntaxCheck { editor {dir ""} } {
 #/////////////////////////////////////////////////////////////////////////////
   global toltk_script_path
-  # guardamos el archivo en un temporal
-  set path [file join $::env(HOME) __check__.tol]
-  set texto [GetSelectionOrAll $editor]
-  set ok [::BayesText::SaveTxt $texto $path]
-  if {$ok} {
-    # evaluamos el archivo
-    set check [TolFileSyntaxCheck $path]
-    if {[lindex $check 0]} {
-      tk_messageBox -type ok -icon info -title [mc "Syntax Check"] -parent $editor \
-        -message [mc "Syntax check done successfully"]
-    } else  {
-      # hay errores
-          #puts "TolSyntaxCheck (hay errores)"
-      ShowSyntaxErrors $editor [lindex $check 1]
-    }
-    # borrar el archivo
-    catch "file delete $path" error
-  } else  {
-    tk_messageBox -type ok -icon warning -title [mc Editor] -parent $editor \
-                -message [mc "Syntax check cannot be done"]
-  }
+
+  set buffer [ GetSelectionOrAll $editor ]
+  if { $dir ne "" } {
+    set cwd [ pwd ]
+    cd $dir
+  }
+
+  if { [ catch { tol::checksyntax $buffer } check ] } {
+    Tolcon_Trace "within ::BayesText::TolSyntaxCheck($editor,$dir): $check"
+    return 0
+  }
+  set check [ string trim $check ]
+  if { $check eq "" } {
+    tk_messageBox -type ok -icon info -title [mc "Syntax Check"] \
+        -parent $editor -message [mc "Syntax check done successfully"]
+  } else {
+    ShowSyntaxErrors $editor $check
+  }
+  return 1
 }
 

tolbase/lib/toltk/editor.tcl

@@ -1571 +1571 @@
 #/////////////////////////////////////////////////////////////////////////////  
   upvar \#0 ${this}::data data
-  ::BayesText::TolSyntaxCheck $data(txt)
+  ::BayesText::TolSyntaxCheck $data(txt) [ file dir $data(nameFile) ]
 }