scratch – Diff between revs 75 and 125

Subversion Repositories:

?pathlinks?

Rev 75 – Details – Blame – Last modification – View Log

-// Generated by CoffeeScript 1.10.0
+// Generated by CoffeeScript 1.12.4
-var Inline, ParseException, Parser, Pattern, Utils;
+var Inline, ParseException, ParseMore, Parser, Pattern, Utils;
 Inline = require('./Inline');
 Pattern = require('./Pattern');
+Utils = require('./Utils');
-Utils = require('./Utils');
+ParseException = require('./Exception/ParseException');
   Parser.prototype.PATTERN_INDENT_SPACES = new Pattern('^ +');
   Parser.prototype.PATTERN_TRAILING_LINES = new Pattern('(\n*)$');
-  Parser.prototype.PATTERN_YAML_HEADER = new Pattern('^\\%YAML[: ][\\d\\.]+.*\n');
+  Parser.prototype.PATTERN_YAML_HEADER = new Pattern('^\\%YAML[: ][\\d\\.]+.*\n', 'm');
-  Parser.prototype.PATTERN_LEADING_COMMENTS = new Pattern('^(\\#.*?\n)+');
+  Parser.prototype.PATTERN_LEADING_COMMENTS = new Pattern('^(\\#.*?\n)+', 'm');
     this.currentLine = '';
     this.refs = {};
+  }
   Parser.prototype.parse = function(value, exceptionOnInvalidType, objectDecoder) {
-    var alias, allowOverwrite, block, c, context, data, e, error, error1, error2, first, i, indent, isRef, j, k, key, l, lastKey, len, len1, len2, len3, lineCount, m, matches, mergeNode, n, name, parsed, parsedItem, parser, ref, ref1, ref2, refName, refValue, val, values;
+    var alias, allowOverwrite, block, c, context, data, e, first, i, indent, isRef, j, k, key, l, lastKey, len, len1, len2, len3, lineCount, m, matches, mergeNode, n, name, parsed, parsedItem, parser, ref, ref1, ref2, refName, refValue, val, values;
     if (exceptionOnInvalidType == null) {
       exceptionOnInvalidType = false;
+    }
     if (objectDecoder == null) {
       } else {
         lineCount = this.lines.length;
         if (1 === lineCount || (2 === lineCount && Utils.isEmpty(this.lines[1]))) {
           try {
             value = Inline.parse(this.lines[0], exceptionOnInvalidType, objectDecoder);
-          } catch (error1) {
+          } catch (error) {
-            e = error1;
+            e = error;
             e.parsedLine = this.getRealCurrentLineNb() + 1;
             e.snippet = this.currentLine;
             throw e;
+          }
           if (typeof value === 'object') {
+          }
           return value;
         } else if ((ref2 = Utils.ltrim(value).charAt(0)) === '[' || ref2 === '{') {
           try {
             return Inline.parse(value, exceptionOnInvalidType, objectDecoder);
-          } catch (error2) {
+          } catch (error) {
-            e = error2;
+            e = error;
             e.parsedLine = this.getRealCurrentLineNb() + 1;
             e.snippet = this.currentLine;
             throw e;
+          }
+        }
     while (this.moveToNextLine()) {
       indent = this.getCurrentLineIndentation();
       if (indent === newIndent) {
         removeComments = !removeCommentsPattern.test(this.currentLine);
+      }
-      if (isItUnindentedCollection && !this.isStringUnIndentedCollectionItem(this.currentLine) && indent === newIndent) {
-        this.moveToPreviousLine();
+      if (removeComments && this.isCurrentLineComment()) {
-        break;
+        continue;
+      }
       if (this.isCurrentLineBlank()) {
         data.push(this.currentLine.slice(newIndent));
         continue;
+      }
-      if (removeComments && this.isCurrentLineComment()) {
+      if (isItUnindentedCollection && !this.isStringUnIndentedCollectionItem(this.currentLine) && indent === newIndent) {
-        if (indent === newIndent) {
+        this.moveToPreviousLine();
-          continue;
-        }
+        break;
+      }
       if (indent >= newIndent) {
         data.push(this.currentLine.slice(newIndent));
       } else if (Utils.ltrim(this.currentLine).charAt(0) === '#') {
   Parser.prototype.moveToPreviousLine = function() {
     this.currentLine = this.lines[--this.currentLineNb];
   };
   Parser.prototype.parseValue = function(value, exceptionOnInvalidType, objectDecoder) {
-    var e, error, error1, foldedIndent, matches, modifiers, pos, ref, ref1, val;
+    var e, foldedIndent, matches, modifiers, pos, ref, ref1, val;
     if (0 === value.indexOf('*')) {
       pos = value.indexOf('#');
       if (pos !== -1) {
         value = value.substr(1, pos - 2);
         return Inline.parseScalar(matches.type + ' ' + val);
       } else {
         return val;
+      }
+    }
-    try {
-      return Inline.parse(value, exceptionOnInvalidType, objectDecoder);
+    if ((ref1 = value.charAt(0)) === '[' || ref1 === '{' || ref1 === '"' || ref1 === "'") {
-    } catch (error) {
+      while (true) {
-      e = error;
-      if (((ref1 = value.charAt(0)) === '[' || ref1 === '{') && e instanceof ParseException && this.isNextLineIndented()) {
-        value += "\n" + this.getNextEmbedBlock();
         try {
           return Inline.parse(value, exceptionOnInvalidType, objectDecoder);
-        } catch (error1) {
+        } catch (error) {
-          e = error1;
+          e = error;
+          if (e instanceof ParseMore && this.moveToNextLine()) {
+            value += "\n" + Utils.trim(this.currentLine, ' ');
+          } else {
-          e.parsedLine = this.getRealCurrentLineNb() + 1;
+            e.parsedLine = this.getRealCurrentLineNb() + 1;
-          e.snippet = this.currentLine;
+            e.snippet = this.currentLine;
-          throw e;
+            throw e;
+          }
+        }
-      } else {
-        e.parsedLine = this.getRealCurrentLineNb() + 1;
-        e.snippet = this.currentLine;
-        throw e;
+      }
+    } else {
+      if (this.isNextLineIndented()) {
+        value += "\n" + this.getNextEmbedBlock();
+      }
+      return Inline.parse(value, exceptionOnInvalidType, objectDecoder);
+    }
   };
   Parser.prototype.parseFoldedScalar = function(separator, indicator, indentation) {