removing regex-based IRI tokenizer
authorNicholas Bollweg <nicholas.bollweg@gtri.gatech.edu>
Thu, 06 Feb 2014 12:52:31 -0500
changeset 2087 49c3811e10c3
parent 2086 b36f07f5d785
child 2088 a41bd5836e74
removing regex-based IRI tokenizer

TODO: maybe revisit to figure out how to do this with the context?
playground/codemirror.jsonld.js
--- a/playground/codemirror.jsonld.js	Sun Nov 03 08:55:27 2013 -0500
+++ b/playground/codemirror.jsonld.js	Thu Feb 06 12:52:31 2014 -0500
@@ -185,15 +185,12 @@
   if(jsonldMode){
     (function(){
       // introduce new string atomic types
-      var ldAtomicTypes = ["jsonld-keyword", "jsonld-iri"],
+      var ldAtomicTypes = ["jsonld-keyword"],
         // JSON-LD keywords
         // http://json-ld.org/spec/latest/json-ld/#syntax-tokens-and-keywords
         ldKeywords = "context|id|value|language|type|container|list|"+
           "set|reverse|index|base|vocab|graph",
         ldKeywordRE = new RegExp("^@(" + ldKeywords + ")(?=\")"),
-        // This is not an implementation of an IRI.
-        // http://www.ietf.org/rfc/rfc3987.txt
-        ldIriRE = new RegExp("([\.\/]|https?://)[^\"]*(?=\")"),
         i = ldAtomicTypes.length;
       
       while(i--){
@@ -212,10 +209,6 @@
           if(ch === "@" && stream.match(ldKeywordRE)){
             ty_st = ret("jsonld-keyword", "meta");
           }
-          // match 
-          else if(~("h/.".indexOf(ch)) && stream.match(ldIriRE)){
-            ty_st = ret("jsonld-iri", "link");
-          }
           
           // consume the quote, reset the tokenizer
           if (!nextUntilUnescaped(stream, quote))
@@ -401,7 +394,7 @@
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
     } else if (type == "number" || type == "string") {
-      cx.marked = type + " property";
+      cx.marked = "property";
     }
     if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expressionNoComma);
   }