Merge jv
authorMerge Script
Tue, 21 Apr 2015 06:45:39 +0200
branchjv
changeset 15581 8dd9d9b6be87
parent 15579 0475c1fef56e (current diff)
parent 15580 deefdf789ee7 (diff)
child 15584 3adfb2dbc3c6
Merge
SyntaxHighlighter2.st
--- a/SyntaxHighlighter2.st	Sat Apr 18 06:57:51 2015 +0200
+++ b/SyntaxHighlighter2.st	Tue Apr 21 06:45:39 2015 +0200
@@ -155,7 +155,11 @@
     text emphasisCollection:(Array new:aString size).
 
     parser nextToken.
-    tree := parser "expression"statementList.
+    [
+        tree := parser "expression"statementList.
+    ] on:ParseError do:[
+        tree := #Error
+    ].
     "/ now, convert the emphasis-array to a runArray
     text emphasisCollection:(text emphasis asRunArray).
 
@@ -1078,14 +1082,14 @@
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.26 2015-02-28 02:15:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.26 2015-02-28 02:15:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: SyntaxHighlighter2.st,v 1.26 2015-02-28 02:15:57 cg Exp $'
+    ^ '$Id: SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
 ! !