jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improvements in the XQuery highlighter.

Browse source
This commit is contained in:
William Candillon 2012-11-01 12:15:08 +01:00
commit 1ac2874ecf
4 changed files with 12530 additions and 8091 deletions
Download patch file Download diff file Expand all files Collapse all files

92
lib/ace/mode/xquery/JSONParseTreeHandler.js Normal file
View file

@ -0,0 +1,92 @@
/* ***** BEGIN LICENSE BLOCK *****
* Distributed under the BSD license:
*
* Copyright (c) 2010, Ajax.org B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* ***** END LICENSE BLOCK ***** */
define(function(require, exports, module){
var JSONParseTreeHandler = exports.JSONParseTreeHandler = function() {
var ast = null;
var ptr = null;
function createNode(name){
return { name: name, children: [], getParent: null };
}
function pushNode(name, begin){
var node = createNode(name);
node.begin = begin;
if(ast === null) {
ast = node;
ptr = node;
} else {
node.getParent = ptr;
ptr.children.push(node);
ptr = ptr.children[ptr.children.length - 1];
}
}
function popNode(name, end){
ptr.end = end;
if(ptr.getParent !== null) {
ptr = ptr.getParent;
for(var i in ptr.children) {
delete ptr.children[i].getParent;
}
} else {
delete ptr.getParent;
}
}
this.getParseTree = function() {
return ast;
};
this.reset = function(input) {};
this.startNonterminal = function(name, begin) {
pushNode(name, begin);
};
this.endNonterminal = function(name, end) {
popNode(name, end);
};
this.terminal = function(name, begin, end) {
var name = (name.substring(0, 1) === "'" && name.substring(name.length - 1) === "'") ? "TOKEN" : name;
pushNode(name, begin);
popNode(name, end);
};
this.whitespace = function(begin, end) {
var name = "WS";
pushNode(name, begin);
popNode(name, end);
};
};
});

20368
lib/ace/mode/xquery/XQueryParser.js
View file

File diff suppressed because it is too large Load diff

155
lib/ace/mode/xquery/visitors/SyntaxHighlighter.js
View file

@ -1,41 +1,11 @@
/* ***** BEGIN LICENSE BLOCK *****
* Distributed under the BSD license:
*
* Copyright (c) 2010, Ajax.org B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* ***** END LICENSE BLOCK ***** */
define(function(require, exports, module){
var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
{
var keywords = ['after', 'ancestor', 'ancestor-or-self', 'and', 'as', 'ascending', 'attribute', 'before', 'case', 'cast', 'castable', 'child', 'collation', 'comment', 'copy', 'count', 'declare', 'default', 'delete', 'descendant', 'descendant-or-self', 'descending', 'div', 'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'end', 'eq', 'every', 'except', 'first', 'following', 'following-sibling', 'for', 'function', 'ge', 'group', 'gt', 'idiv', 'if', 'then', 'import', 'insert', 'instance', 'intersect', 'into', 'is', 'item', 'last', 'le', 'let', 'lt', 'mod', 'modify', 'module', 'namespace', 'namespace-node', 'ne', 'node', 'only', 'or', 'order', 'ordered', 'parent', 'preceding', 'preceding-sibling', 'processing-instruction', 'rename', 'replace', 'return', 'satisfies', 'schema-attribute', 'schema-element', 'self', 'some', 'stable', 'start', 'switch', 'text', 'to', 'treat', 'try', 'typeswitch', 'union', 'unordered', 'validate', 'where', 'with', 'xquery', 'contains', 'paragraphs', 'sentences', 'times', 'words', 'by', 'collection', 'allowing', 'at', 'base-uri', 'boundary-space', 'break', 'catch', 'construction', 'context', 'continue', 'copy-namespaces', 'decimal-format', 'encoding', 'exit', 'external', 'ft-option', 'in', 'index', 'integrity', 'lax', 'nodes', 'option', 'ordering', 'revalidation', 'schema', 'score', 'sliding', 'strict', 'tumbling', 'type', 'updating', 'value', 'variable', 'version', 'while', 'constraint', 'loop', 'returning', 'append', 'array', 'json-item', 'object', 'structured-item', 'when', 'next', 'previous'];
var keywords = ['after', 'ancestor', 'ancestor-or-self', 'and', 'as', 'ascending', 'attribute', 'before', 'case', 'cast', 'castable', 'child', 'collation', 'comment', 'copy', 'count', 'declare', 'default', 'delete', 'descendant', 'descendant-or-self', 'descending', 'div', 'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'end', 'eq', 'every', 'except', 'first', 'following', 'following-sibling', 'for', 'function', 'ge', 'group', 'gt', 'idiv', 'if', 'then', 'import', 'insert', 'instance', 'intersect', 'into', 'is', 'item', 'last', 'le', 'let', 'lt', 'mod', 'modify', 'module', 'namespace', 'namespace-node', 'ne', 'node', 'only', 'or', 'order', 'ordered', 'parent', 'preceding', 'preceding-sibling', 'processing-instruction', 'rename', 'replace', 'return', 'satisfies', 'schema-attribute', 'schema-element', 'self', 'some', 'stable', 'start', 'switch', 'text', 'to', 'treat', 'try', 'typeswitch', 'union', 'unordered', 'validate', 'where', 'with', 'xquery', 'contains', 'paragraphs', 'sentences', 'times', 'words', 'by', 'collection', 'allowing', 'at', 'base-uri', 'boundary-space', 'break', 'catch', 'construction', 'context', 'continue', 'copy-namespaces', 'decimal-format', 'encoding', 'exit', 'external', 'ft-option', 'in', 'index', 'integrity', 'lax', 'nodes', 'option', 'ordering', 'revalidation', 'schema', 'score', 'sliding', 'strict', 'tumbling', 'type', 'updating', 'value', 'variable', 'version', 'while', 'constraint', 'loop', 'returning', 'append', 'array', 'json-item', 'object', 'structured-item', 'when', 'next', 'previous', 'window'];
var states = ["cdata", "comment", "tag"];
var info = { lines: [ [] ], states: [] };
var inName = false;
// var inName = false;
this.getTokens = function() {
this.visit(tree);
@ -131,19 +101,19 @@ var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
// return true;
//};
this.FunctionName = function(node)
{
for(var i in node.children) {
var child = node.children[i];
if(child.name === "EQName" || child.name === "TOKEN") {
var value = child.children[0].value;
this.addTokens(value, "support.function");
} else {
this.visit(child);
}
}
return true;
};
//this.FunctionName = function(node)
//{
// for(var i in node.children) {
// var child = node.children[i];
// if(child.children[0] && (child.name === "EQName" || child.name === "TOKEN")) {
// var value = this.getNodeValue(child.children[0]);
// this.addTokens(value, "support.function");
// } else {
// this.visit(child);
// }
// }
// return true;
//};
this.StringConcatExpr = function(node)
{
@ -260,57 +230,67 @@ var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
return true;
};
this.NCName = function(node)
{
inName = true;
for(var i in node.children)
{
var child = node.children[i];
this.visit(child);
}
inName = false;
return true;
};
// this.NCName = function(node)
// {
// inName = true;
// for(var i in node.children)
// {
// var child = node.children[i];
// this.visit(child);
// }
// inName = false;
// return true;
// };
this.EQName = function(node)
{
inName = true;
for(var i in node.children)
{
var child = node.children[i];
this.visit(child);
}
inName = false;
var value = this.getNodeValue(node);
this.addTokens(value, "support.function");
//inName = true;
//for(var i in node.children)
//{
// var child = node.children[i];
// this.visit(child);
//}
//inName = false;
return true;
};
this.TOKEN = function(node)
{
value = node.children[0].value;
if(keywords.indexOf(value) > -1 && !inName) {
var value = this.getNodeValue(node);
if(keywords.indexOf(value) > -1 ) {//&& !inName) {
this.addTokens(value, "keyword");
return true;
} else if(value === "$") {
} else {
return false;
this.addTokens(value, "text");
}
return true;
};
this.WS = function(node) {
var value = this.getNodeValue(node);
var openingIdx = value.indexOf("(:");
while(openingIdx > -1) {
var text = value.substring(0, openingIdx);
this.addTokens(text, "text");
var closingIdx = value.substring(openingIdx).indexOf(":)") + 3;
var comment = value.substring(openingIdx, closingIdx);
this.addTokens(comment, "comment");
value = value.substring(closingIdx);
openingIdx = value.indexOf("(:");
}
this.addTokens(value, "text");
};
this.EverythingElse = function(node)
{
if(typeof node["pos"] === "object")
{
var value = node.value;
var openingIdx = value.indexOf("(:");
while(openingIdx > -1) {
var text = value.substring(0, openingIdx);
this.addTokens(text, "text");
var closingIdx = value.substring(openingIdx).indexOf(":)") + 3;
var comment = value.substring(openingIdx, closingIdx);
this.addTokens(comment, "comment");
value = value.substring(closingIdx);
openingIdx = value.indexOf("(:");
}
if(node.children.length === 0) {
var value = this.getNodeValue(node);
this.addTokens(value, "text");
return true;
}
return false;
};
@ -323,17 +303,20 @@ var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
skip = this[name](node) === true ? true : false ;
else
skip = this.EverythingElse(node) === true ? true : false;
if(!skip && typeof node.children === "object")
{
var isVarEQName = false;
for(var i = 0; i < node.children.length; i++)
{
var child = node.children[i];
if(child.name === "TOKEN" && child.children[0].value === "$") {
i++;
var next = node.children[i];
var value = source.substring(child.children[0].pos.begin, next.end);
this.addTokens(value, "variable");
var value = this.getNodeValue(child);
if(child.name === "TOKEN" && value === "$")
{
isVarEQName = true;
} else if(isVarEQName) {
this.addTokens("$" + value, "variable");
isVarEQName = false;
} else {
this.visit(child);
}

6
lib/ace/mode/xquery_worker.js
View file

@ -33,6 +33,7 @@ define(function(require, exports, module) {
var oop = require("../lib/oop");
var Mirror = require("../worker/mirror").Mirror;
var JSONParseTreeHandler = require("./xquery/JSONParseTreeHandler").JSONParseTreeHandler;
var XQueryParser = require("./xquery/XQueryParser").XQueryParser;
var SyntaxHighlighter = require("../mode/xquery/visitors/SyntaxHighlighter").SyntaxHighlighter;
window.addEventListener = function() {};
@ -50,10 +51,11 @@ oop.inherits(XQueryWorker, Mirror);
this.onUpdate = function() {
this.sender.emit("start");
var value = this.doc.getValue();
var parser = new XQueryParser(value);
var h = new JSONParseTreeHandler();
var parser = new XQueryParser(value, h);
try {
parser.parse_XQuery();
var ast = parser.getAST();
var ast = h.getParseTree();
this.sender.emit("ok");
var highlighter = new SyntaxHighlighter(value, ast);
var tokens = highlighter.getTokens();