Browse Source

Merge commit '676dab3151ac91bec8e56a413f4a5a45a892b158' into develop

Mark Sibly 8 years ago
parent
commit
83f4944643

+ 8 - 0
src/ted2go/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
src/ted2go/syntax/codeformatter.monkey2 → src/ted2go/syntax/CodeFormatter.monkey2


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


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


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


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


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


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


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


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


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