Add proof of concept for semantic highlighting.

build/src/mode-xquery-uncompressed-noconflict.js

@@ -16,19 +16,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-ace.define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
+ace.define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/xquery_tokenizer', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
 "use strict";
 
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
+var Tokenizer = require("./xquery_tokenizer").XQueryTokenizer;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
+    this.$tokenizer = new XQueryTokenizer();
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -117,6 +116,59 @@ oop.inherits(Mode, TextMode);
 
 exports.Mode = Mode;
 });
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      William Candillon <wcandillon AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+ace.define('ace/mode/xquery_tokenizer', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/xquery_highlight_rules'], function(require, exports, module) {
+"use strict";
+  
+  var Tokenizer = require("../tokenizer").Tokenizer;
+  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
+
+  var XQueryTokenizer = exports.XQueryTokenizer = function(){
+    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
+  };
+
+  (function() {
+    this.getLineTokens = function(line, startState) {
+      return this.$regexpTokenizer.getLineTokens(line, startState);
+    };
+  }).call(XQueryTokenizer.prototype);
+}); 
 /*
  *  eXide - web-based XQuery IDE
  *  

build/src/mode-xquery-uncompressed.js

@@ -16,19 +16,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
+define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/xquery_tokenizer', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
 "use strict";
 
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
+var Tokenizer = require("./xquery_tokenizer").XQueryTokenizer;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
+    this.$tokenizer = new XQueryTokenizer();
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -117,6 +116,59 @@ oop.inherits(Mode, TextMode);
 
 exports.Mode = Mode;
 });
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      William Candillon <wcandillon AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define('ace/mode/xquery_tokenizer', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/xquery_highlight_rules'], function(require, exports, module) {
+"use strict";
+  
+  var Tokenizer = require("../tokenizer").Tokenizer;
+  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
+
+  var XQueryTokenizer = exports.XQueryTokenizer = function(){
+    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
+  };
+
+  (function() {
+    this.getLineTokens = function(line, startState) {
+      return this.$regexpTokenizer.getLineTokens(line, startState);
+    };
+  }).call(XQueryTokenizer.prototype);
+}); 
 /*
  *  eXide - web-based XQuery IDE
  *