Improved unquoted strings.

URLs can be used in unquoted strings Accented characters can be used as initial letters in unquoted strings. Signed-off-by: Tj Holowaychuk <tj@vision-media.ca>
coolaj86 · Apr 15, 2011 · 9b9597f · 9b9597f
1 parent e1cc4f8
commit 9b9597f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/yaml.js b/lib/yaml.js
@@ -41,10 +41,8 @@ var tokens = [
   ['false', /^(disabled|false|no|off)/],
   ['string', /^"(.*?)"/],
   ['string', /^'(.*?)'/],
-  ['string', /^([a-zA-Z][^:,\]\}]*?)(?=\s*[,\n\]\}])/],
   ['float', /^(\d+\.\d+)/],
   ['int', /^(\d+)/],
-  ['id', /^([\w ]+)/],
   ['doc', /^---/],
   [',', /^,/],
   ['{', /^\{/],
@@ -53,6 +51,8 @@ var tokens = [
   [']', /^\]/],
   ['-', /^\-/],
   [':', /^[:]/],
+  ['string', /^(.([^:,\]\}]|:\/\/)*?)(?=\s*[,\n\]\}])/],
+  ['id', /^([\w ]+)/],
 ]
 
 /**