瀏覽代碼

Squashed 'src/ted2go/' changes from 257d070c..7b67f8da

7b67f8da Merge branch 'dev'
742f8717 Fixed filenames (just rename files isn't work with git, so I manually called  'git mv').
0360f74b Fixed a case when parser got invalid json from mx2cc.

git-subtree-dir: src/ted2go
git-subtree-split: 7b67f8da7a9ec7bded4cd74b9c72eb7eeea77316
Mark Sibly 8 年之前
父節點
當前提交
676dab3151

+ 8 - 0
parser/Monkey2Parser.monkey2

@@ -120,12 +120,20 @@ Class Monkey2Parser Extends CodeParserPlugin
 		
 		' start parsing process
 		Local str:=StartParsing( pathOnDisk,isModule )
+		
+'		If Not isModule
+'			Print "-----"
+'			Print str
+'			Print "-----"
+'		Endif
+		
 		Local hasErrors:=(str.Find( "] : Error : " ) > 0)
 		
 		Local i:=str.Find( "{" )
 		
 		' return errors
 		If hasErrors Return (i > 0) ? str.Slice( 0,i ) Else str
+		If i=-1 Return "" ' not a valid json
 		
 		'----------
 		

+ 0 - 0
syntax/codeformatter.monkey2 → syntax/CodeFormatter.monkey2


+ 0 - 0
syntax/cpphighlighter.monkey2 → syntax/CppHighlighter.monkey2


+ 0 - 0
syntax/cppkeywords.monkey2 → syntax/CppKeywords.monkey2


+ 0 - 0
syntax/highlighter.monkey2 → syntax/Highlighter.monkey2


+ 0 - 0
syntax/keywords.monkey2 → syntax/Keywords.monkey2


+ 0 - 0
syntax/monkey2formatter.monkey2 → syntax/Monkey2Formatter.monkey2


+ 0 - 0
syntax/monkey2highlighter.monkey2 → syntax/Monkey2Highlighter.monkey2


+ 0 - 0
syntax/monkey2keywords.monkey2 → syntax/Monkey2Keywords.monkey2


+ 0 - 0
utils/jsonutils.monkey2 → utils/JsonUtils.monkey2


+ 0 - 0
utils/utils.monkey2 → utils/Utils.monkey2