Merge pull request #80 from ar-shao/multiline

jeremyfa · web-flow · commit 5e74781976ad · 2017-02-12T00:39:06.000+01:00
Multiline compact sequence/mapping/string
diff --git a/Cakefile b/Cakefile
@@ -21,7 +21,7 @@ task 'build', 'build project', ->
             fs.mkdirSync libDir
         unless fs.existsSync libDir+'/Exception'
             fs.mkdirSync libDir+'/Exception'
-        toCompile = 'Yaml Utils Unescaper Pattern Parser Inline Escaper Dumper Exception/ParseException Exception/DumpException'.split ' '
+        toCompile = 'Yaml Utils Unescaper Pattern Parser Inline Escaper Dumper Exception/ParseException Exception/ParseMore Exception/DumpException'.split ' '
         do compileOne = ->
             name = toCompile.shift()
             outputDir = (if '/' in name then libDir+'/Exception' else libDir)
@@ -40,7 +40,7 @@ task 'build', 'build project', ->
             fs.mkdirSync libDebugDir
         unless fs.existsSync libDebugDir+'/Exception'
             fs.mkdirSync libDebugDir+'/Exception'
-        toCompile = 'Yaml Utils Unescaper Pattern Parser Inline Escaper Dumper Exception/ParseException Exception/DumpException'.split ' '
+        toCompile = 'Yaml Utils Unescaper Pattern Parser Inline Escaper Dumper Exception/ParseException Exception/ParseMore Exception/DumpException'.split ' '
         do compileOne = ->
             name = toCompile.shift()
             outputDir = (if '/' in name then libDebugDir+'/Exception' else libDebugDir)
diff --git a/src/Exception/ParseMore.coffee b/src/Exception/ParseMore.coffee
@@ -0,0 +1,12 @@
+
+class ParseMore extends Error
+
+    constructor: (@message, @parsedLine, @snippet) ->
+
+    toString: ->
+        if @parsedLine? and @snippet?
+            return '<ParseMore> ' + @message + ' (line ' + @parsedLine + ': \'' + @snippet + '\')'
+        else
+            return '<ParseMore> ' + @message
+
+module.exports = ParseMore
diff --git a/src/Inline.coffee b/src/Inline.coffee
@@ -4,6 +4,7 @@ Unescaper       = require './Unescaper'
 Escaper         = require './Escaper'
 Utils           = require './Utils'
 ParseException  = require './Exception/ParseException'
+ParseMore       = require './Exception/ParseMore'
 DumpException   = require './Exception/DumpException'
 
 # Inline YAML parsing and dumping
@@ -211,13 +212,13 @@ class Inline
     #
     # @return [String]  A YAML string
     #
-    # @throw [ParseException] When malformed inline YAML string is parsed
+    # @throw [ParseMore] When malformed inline YAML string is parsed
     #
     @parseQuotedScalar: (scalar, context) ->
         {i} = context
 
         unless match = @PATTERN_QUOTED_SCALAR.exec scalar[i..]
-            throw new ParseException 'Malformed inline YAML string ('+scalar[i..]+').'
+            throw new ParseMore 'Malformed inline YAML string ('+scalar[i..]+').'
 
         output = match[0].substr(1, match[0].length - 2)
 
@@ -239,7 +240,7 @@ class Inline
     #
     # @return [String]  A YAML string
     #
-    # @throw [ParseException] When malformed inline YAML string is parsed
+    # @throw [ParseMore] When malformed inline YAML string is parsed
     #
     @parseSequence: (sequence, context) ->
         output = []
@@ -282,7 +283,7 @@ class Inline
 
             ++i
 
-        throw new ParseException 'Malformed inline YAML string '+sequence
+        throw new ParseMore 'Malformed inline YAML string '+sequence
 
 
     # Parses a mapping to a YAML string.
@@ -292,7 +293,7 @@ class Inline
     #
     # @return [String]  A YAML string
     #
-    # @throw [ParseException] When malformed inline YAML string is parsed
+    # @throw [ParseMore] When malformed inline YAML string is parsed
     #
     @parseMapping: (mapping, context) ->
         output = {}
@@ -364,7 +365,7 @@ class Inline
                 if done
                     break
 
-        throw new ParseException 'Malformed inline YAML string '+mapping
+        throw new ParseMore 'Malformed inline YAML string '+mapping
 
 
     # Evaluates scalars and replaces magic values.
diff --git a/src/Parser.coffee b/src/Parser.coffee
@@ -3,6 +3,7 @@ Inline          = require './Inline'
 Pattern         = require './Pattern'
 Utils           = require './Utils'
 ParseException  = require './Exception/ParseException'
+ParseMore       = require './Exception/ParseMore'
 
 # Parser parses YAML strings to convert them to JavaScript objects.
 #
@@ -416,25 +417,22 @@ class Parser
             else
                 return val
 
-        try
-            return Inline.parse value, exceptionOnInvalidType, objectDecoder
-        catch e
-            # Try to parse multiline compact sequence or mapping
-            if value.charAt(0) in ['[', '{'] and e instanceof ParseException and @isNextLineIndented()
-                value += "\n" + @getNextEmbedBlock()
+        # Value can be multiline compact sequence or mapping or string
+        if value.charAt(0) in ['[', '{', '"', "'"]
+            while true
                 try
                     return Inline.parse value, exceptionOnInvalidType, objectDecoder
                 catch e
-                    e.parsedLine = @getRealCurrentLineNb() + 1
-                    e.snippet = @currentLine
-
-                    throw e
-
-            else
-                e.parsedLine = @getRealCurrentLineNb() + 1
-                e.snippet = @currentLine
-
-                throw e
+                    if e instanceof ParseMore and @moveToNextLine()
+                        value += "\n" + Utils.trim(@currentLine, ' ')
+                    else
+                        e.parsedLine = @getRealCurrentLineNb() + 1
+                        e.snippet = @currentLine
+                        throw e
+        else
+            if @isNextLineIndented()
+                value += "\n" + @getNextEmbedBlock()
+            return Inline.parse value, exceptionOnInvalidType, objectDecoder
 
         return
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ Unescaper = require './Unescaper'`
`4`	`4`	`Escaper = require './Escaper'`
`5`	`5`	`Utils = require './Utils'`
`6`	`6`	`ParseException = require './Exception/ParseException'`
	`7`	`+ParseMore = require './Exception/ParseMore'`
`7`	`8`	`DumpException = require './Exception/DumpException'`
`8`	`9`
`9`	`10`	`# Inline YAML parsing and dumping`
`@@ -211,13 +212,13 @@ class Inline`
`211`	`212`	`#`
`212`	`213`	`# @return [String] A YAML string`
`213`	`214`	`#`
`214`		`- # @throw [ParseException] When malformed inline YAML string is parsed`
	`215`	`+ # @throw [ParseMore] When malformed inline YAML string is parsed`
`215`	`216`	`#`
`216`	`217`	`@parseQuotedScalar: (scalar, context) ->`
`217`	`218`	`{i} = context`
`218`	`219`
`219`	`220`	`unless match = @PATTERN_QUOTED_SCALAR.exec scalar[i..]`
`220`		`- throw new ParseException 'Malformed inline YAML string ('+scalar[i..]+').'`
	`221`	`+ throw new ParseMore 'Malformed inline YAML string ('+scalar[i..]+').'`
`221`	`222`
`222`	`223`	`output = match[0].substr(1, match[0].length - 2)`
`223`	`224`
`@@ -239,7 +240,7 @@ class Inline`
`239`	`240`	`#`
`240`	`241`	`# @return [String] A YAML string`
`241`	`242`	`#`
`242`		`- # @throw [ParseException] When malformed inline YAML string is parsed`
	`243`	`+ # @throw [ParseMore] When malformed inline YAML string is parsed`
`243`	`244`	`#`
`244`	`245`	`@parseSequence: (sequence, context) ->`
`245`	`246`	`output = []`
`@@ -282,7 +283,7 @@ class Inline`
`282`	`283`
`283`	`284`	`++i`
`284`	`285`
`285`		`- throw new ParseException 'Malformed inline YAML string '+sequence`
	`286`	`+ throw new ParseMore 'Malformed inline YAML string '+sequence`
`286`	`287`
`287`	`288`
`288`	`289`	`# Parses a mapping to a YAML string.`
`@@ -292,7 +293,7 @@ class Inline`
`292`	`293`	`#`
`293`	`294`	`# @return [String] A YAML string`
`294`	`295`	`#`
`295`		`- # @throw [ParseException] When malformed inline YAML string is parsed`
	`296`	`+ # @throw [ParseMore] When malformed inline YAML string is parsed`
`296`	`297`	`#`
`297`	`298`	`@parseMapping: (mapping, context) ->`
`298`	`299`	`output = {}`
`@@ -364,7 +365,7 @@ class Inline`
`364`	`365`	`if done`
`365`	`366`	`break`
`366`	`367`
`367`		`- throw new ParseException 'Malformed inline YAML string '+mapping`
	`368`	`+ throw new ParseMore 'Malformed inline YAML string '+mapping`
`368`	`369`
`369`	`370`
`370`	`371`	`# Evaluates scalars and replaces magic values.`