--- capa/capa51/GUITools/quizzer.tcl	1999/10/26 16:47:36	1.5
+++ capa/capa51/GUITools/quizzer.tcl	1999/10/28 16:32:07	1.6
@@ -2228,11 +2228,32 @@ proc createPreviewWindow {} {
 }
 
 ###########################################################
+# openError
+###########################################################
+###########################################################
+###########################################################
+proc openError { file line type} {
+    global gRefLine gLineNumberGoto gTextWindow
+    if { $type == 2 } {
+	set gLineNumberGoto $line
+	gotoLine
+	capaRaise [winfo toplevel $gTextWindow]
+    } else {
+	if {[set num [openReferenceFile $file]]} {
+	    update idletasks
+	    set gRefLine($num) $line
+	    gotoRefLine $num
+	}
+    }
+}
+
+###########################################################
+# showParseErrors
 ###########################################################
 ###########################################################
 ###########################################################
 proc showParseErrors {} {
-    global gParseErrorsText gWindowMenu
+    global gParseErrorsText gWindowMenu gUniqueNumber gCapaConfig
 
     set parseErrors [getParseErrors]
     
@@ -2283,25 +2304,28 @@ proc showParseErrors {} {
 	    capaRaise .parseErrors
 	}
 	foreach line [split $parseErrors "\n"] {
-	    if { [regexp {File:.+->(.+), Line ([0-9]+): ERROR:} $line a one two three four five]} {
-		puts a:$a
-		puts one:$one
-		puts two:$two
-		puts three:$three
-		puts four:$four
-		puts five:$five
+	    set tag 0
+	    if { [regexp -indices {File:.+->(.+), Line ([0-9]+): ERROR:} $line result file linenum]} {
+		set tag 1
 	    } else {
-		if { [regexp {File:(.+), Line ([0-9]+): ERROR:} $line a one two three four five]} {
-		    puts a:$a
-		    puts one:$one
-		    puts two:$two
-		    puts three:$three
-		    puts four:$four
-		    puts five:$five
+		if { [regexp -indices {File:(.+), Line ([0-9]+): ERROR:} $line result file linenum]} {
+		    set tag 2
 		}
 	    }
+	    if { $tag } {
+		set tagnum [incr gUniqueNumber]
+		set linenum [eval [list string range $line] $linenum]
+		set filename [eval [list string range $line] $file]
+		set i [expr [lindex [split [$gParseErrorsText index end] .] 0] - 1]
+	    }
+	    $gParseErrorsText insert end "$line\n"
+	    if { $tag } {
+		$gParseErrorsText tag add error.$tagnum $i.[lindex $file 0] $i.[expr [lindex $file 1] + 1]
+		$gParseErrorsText tag configure error.$tagnum -foreground $gCapaConfig(IMP_color)
+		$gParseErrorsText tag bind error.$tagnum <Double-ButtonPress> \
+		    "eval openError $filename $linenum $tag"
+	    }
 	}
-	$gParseErrorsText insert end $parseErrors
     } else {
 	if { [winfo exists .parseErrors] } { $gParseErrorsText delete 0.0 end }
     }
@@ -2731,7 +2755,7 @@ proc isReferenceFileOpen { file } {
 	    set entryfile [lindex $entry 1]
 	}
 #	puts $entryfile
-	if { [catch {file stat $entryfile a1}] } { puts skipped;continue }
+	if { [catch {file stat $entryfile a1}] } { continue }
 	file stat $file a2
 #	puts "$a2(ino) == $a1(ino)"
 	if { $a2(ino) == $a1(ino) } {
@@ -2788,18 +2812,19 @@ proc openReferenceFile { {file ""} {new
 		      -title "Select the proper file" \
 		      -initialdir "$gDir(reference)" ]
 	event generate .main <ButtonRelease-1>
-	if { $file == "" } { return }
+	if { $file == "" } { return 0 }
 	set gDir(reference) [file dirname $file]
 	
 	if { [file isdirectory $file] } {
 	    displayError "You attempted to open $file which is a directory not a file."
-	    return
+	    return 0
 	}
     } else {
 	if { !$new } {
 	    if { [set window [isReferenceFileOpen $file] ] != "" } { 
+		set num [lindex [split [lindex [split $window .] 1] e] end]
 		capaRaise $window
-		return 
+		return $num
 	    }
 	    # specifically opening the capa.config file
 	    if { $file == "capa.config" } {
@@ -2810,18 +2835,18 @@ proc openReferenceFile { {file ""} {new
 				      { {All Files} {"*"} } } \
 				  -title "Select the proper file" \
 				  -initialdir "$gDir(reference)" ]
-		    if { $file == "" } { return }
+		    if { $file == "" } { return 0 }
 		} else {
 		    set file [file join [file dirname $gFile] capa.config]
 		}
 	    } else {
 		if { ![file isfile $file] && ![file readable $file] } {
 		    displayError "Unable to find $file"
-		    return
+		    return 0
 		}
 		if { [file isdirectory $file] } {
 		    displayError "You attempted to open $file which is a directory not a file."
-		    return
+		    return 0
 		}
 	    }
 	}
@@ -2939,6 +2964,7 @@ proc openReferenceFile { {file ""} {new
     set gRefChanged($num) 0
     set gRefClosed($num) 0
     addFindList $num
+    return $num
 }
 
 ###########################################################
@@ -2995,7 +3021,7 @@ proc trackChanges { procName num } {
 ###########################################################
 ###########################################################
 proc undo { num } {
-    global gUndo gRefText gTextWindow
+    global gUndo gRefText gTextWindow gChanged gRefChanged
     if { $gUndo($num.cur) == 0 } { return }
     set undoInfo $gUndo($num.$gUndo($num.cur))
     if { [regexp {.*[\"/].*} $undoInfo] } {
@@ -3006,8 +3032,10 @@ proc undo { num } {
     }
     if { $num == 0 } {
 	if {[catch {eval ".$gTextWindow $gUndo($num.$gUndo($num.cur))"}]} { return }
+	set gChanged 1
     } else {
 	if {[catch {eval ".$gRefText($num) $gUndo($num.$gUndo($num.cur))"}]} { return }
+	set gRefChanged($num) 1
     }
     incr gUndo($num.cur) -1
 }