Made constructor return something

nodeca · Oct 30, 2011 · c40dd37 · c40dd37
1 parent 2480b67
commit c40dd37
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 15 deletions.
diff --git a/lib/js-yaml/constructor.js b/lib/js-yaml/constructor.js
@@ -2,7 +2,8 @@ JS.require('JS.Class');
 JS.require('JS.Hash');
 
 
-var __ = require('./core').import('types', 'error', 'nodes'),
+var $$ = require('./core'),
+    __ = $$.import('types', 'error', 'nodes'),
     debug = require('./debug');
 
 
@@ -156,9 +157,18 @@ var BaseConstructor = exports.BaseConstructor = new JS.Class('BaseConstructor',
                   node.startMark);
     }
 
-    mapping = new JS.Hash();
-    node.forEachPair(function (key_node, value_node) {
-      var key, value;
+    mapping = {};
+
+    if (debug.ENABLED) {
+      debug('constructor#constructMapping -- constructing', {value: node.value});
+    }
+
+    $$.each(node.value, function (pair) {
+      var key_node = pair[0], value_node = pair[1], key, value;
+
+      if (debug.ENABLED) {
+        debug('constructor#constructMapping -- got pair', {pair: pair});
+      }
 
       key = this.constructObject(key_node, deep);
       // TODO: Replace with interface test???
@@ -167,8 +177,14 @@ var BaseConstructor = exports.BaseConstructor = new JS.Class('BaseConstructor',
                     "found unhashable key", node.startMark);
       }
       value = this.constructObject(value_node, deep);
-      mapping.store(key, value);
+
+      if (debug.ENABLED) {
+        debug('constructor#constructMapping -- constructed', {key: key, value: value});
+      }
+
+      mapping[key] = value;
     }, this);
+
     return mapping;
   },
 
@@ -204,12 +220,18 @@ var SafeConstructor = exports.SafeConstructor = new JS.Class('SafeConstructor',
   constructScalar: function (node) {
     var result;
 
-    if (!node.isA(__.MappingNode)) {
-      node.value.forEachPair(function (key_node, value_node) {
+    if (debug.ENABLED) {
+      debug('constructor#constructScalar', {node: node});
+    }
+
+    if (node.isA(__.MappingNode)) {
+      $$.each(node.value, function (pair) {
+        var key_node = pair[0], value_node = pair[1], value;
+
         if ('tag:yaml.org,2002:value' === key_node.tag) {
           result = this.constructScalar(value_node);
         }
-      });
+      }, this);
 
       if (undefined !== result) {
         return result;
@@ -222,9 +244,14 @@ var SafeConstructor = exports.SafeConstructor = new JS.Class('SafeConstructor',
   flattenMapping: function (node) {
     var merge = [], index = 0;
 
+    if (debug.ENABLED) {
+      debug('constructor#flattenMapping', {value: node.value});
+    }
+
     while (index < node.value.length) {
-        // TODO Implement this crazy logic
-        console.log('skip'); // for lint
+      // TODO Implement this crazy logic
+      debug('constructor#flattenMapping', {index: index});
+      index++;
     }
 
     if (!!merge.length) {
@@ -336,7 +363,7 @@ var SafeConstructor = exports.SafeConstructor = new JS.Class('SafeConstructor',
 
 
   constructYamlStr: function (node) {
-    return "STR: Not Implemented Yet";
+    return this.constructScalar(node);
   },
 
 
@@ -346,11 +373,20 @@ var SafeConstructor = exports.SafeConstructor = new JS.Class('SafeConstructor',
 
 
   constructYamlMap: function (node) {
-    return "MAP: Not Implemented Yet";
+    var data = {}, value;
+    /* yield data */
+    value = this.constructMapping(node, true);
+    $$.extend(data, value);
+    return data; // should be rewritten in a normal manner
   },
 
 
   constructUndefined: function (node) {
+    if (debug.ENABLED) {
+      debug('constructor#constructUndefined', {node: node});
+      throw new Error('WTF');
+    }
+
     throw new ConstructorError(null, null,
                 "could not determine constructor for the tag " + node.tag,
                 node.startMark);

diff --git a/lib/js-yaml/core.js b/lib/js-yaml/core.js
@@ -28,12 +28,21 @@ $$.import = function import() {
 // iterates through all object keys-value pairs calling iterator on each one
 // example: $$.each(hash, function (val, key) { /* ... */ });
 $$.each = function each(obj, iterator, context) {
-  var keys = Object.getOwnPropertyNames(obj), i, l;
+  var keys, i, l;
+
+  if (null === obj || undefined === obj) {
+    return;
+  }
 
   context = context || iterator;
 
-  for (i = 0, l = keys.length; i < l; i++) {
-    iterator.call(context, obj[keys[i]], keys[i], obj);
+  if (obj.forEach === Array.prototype.forEach) {
+    obj.forEach(iterator, context);
+  } else {
+    keys = Object.getOwnPropertyNames(obj);
+    for (i = 0, l = keys.length; i < l; i++) {
+      iterator.call(context, obj[keys[i]], keys[i], obj);
+    }
   }
 };