diff --git a/lib/ace/mode/_test/tokens_xquery.json b/lib/ace/mode/_test/tokens_xquery.json index 3b29b156..aaf9ab9b 100644 --- a/lib/ace/mode/_test/tokens_xquery.json +++ b/lib/ace/mode/_test/tokens_xquery.json @@ -1,281 +1,44 @@ -<<<<<<< .mine [[ - "start", + "[\"start\"]", ["keyword","xquery"], ["text"," "], ["keyword","version"], ["text"," "], - ["string","\"1.0\""], + ["string","\""], + ["string","1.0"], + ["string","\""], ["text",";"] ],[ - "start" + "[\"start\"]" ],[ - "start", + "[\"start\"]", ["keyword","let"], ["text"," "], ["variable","$message"], ["text"," "], ["keyword.operator",":="], ["text"," "], - ["string","\"Hello World!\""] + ["string","\""], + ["string","Hello World!"], + ["string","\""] ],[ - "start", + "[\"start\",\"StartTag\",\"TagContent\"]", ["keyword","return"], ["text"," "], - ["text","<"], - ["meta.tag","results"], - ["text",">"] + ["meta.tag",""] ],[ - "start", + "[\"start\",\"StartTag\",\"TagContent\"]", ["text"," "], - ["text","<"], - ["meta.tag","message"], - ["text",">"], - ["lparen","{"], + ["meta.tag",""], + ["text","{"], ["variable","$message"], - ["rparen","}"], - ["text",""] + ["text","}"], + ["meta.tag",""] ],[ - "start", - ["text",""] + "[\"start\"]", + ["meta.tag",""] ],[ - "start" -]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= -[ - [ - "[\"start\"]", - [ - "keyword", - "xquery" - ], - [ - "text", - " " - ], - [ - "keyword", - "version" - ], - [ - "text", - " " - ], - [ - "string", - "\"" - ], - [ - "string", - "1.0" - ], - [ - "string", - "\"" - ], - [ - "text", - ";" - ] - ], - [ - "[\"start\"]" - ], - [ - "[\"start\"]", - [ - "keyword", - "let" - ], - [ - "text", - " " - ], - [ - "variable", - "$message" - ], - [ - "text", - " " - ], - [ - "keyword.operator", - ":=" - ], - [ - "text", - " " - ], - [ - "string", - "\"" - ], - [ - "string", - "Hello World!" - ], - [ - "string", - "\"" - ] - ], - [ - "[\"start\",\"StartTag\",\"TagContent\"]", - [ - "keyword", - "return" - ], - [ - "text", - " " - ], - [ - "meta.tag", - "" - ] - ], - [ - "[\"start\",\"StartTag\",\"TagContent\"]", - [ - "text", - " " - ], - [ - "meta.tag", - "" - ], - [ - "text", - "{" - ], - [ - "variable", - "$message" - ], - [ - "text", - "}" - ], - [ - "meta.tag", - "" - ] - ], - [ - "[\"start\"]", - [ - "meta.tag", - "" - ] - ], - [ - "[\"start\"]" - ] -] ->>>>>>> .theirs \ No newline at end of file + "[\"start\"]" +]] \ No newline at end of file diff --git a/lib/ace/mode/xquery/XQueryTokenizer.ebnf b/lib/ace/mode/xquery/XQueryTokenizer.ebnf index f245681c..3800584f 100644 --- a/lib/ace/mode/xquery/XQueryTokenizer.ebnf +++ b/lib/ace/mode/xquery/XQueryTokenizer.ebnf @@ -52,6 +52,7 @@ start ::= ' +// This file was generated on Sun Jan 27, 2013 10:10 (UTC+01) by REx v5.21 which is Copyright (c) 1979-2012 by Gunther Rademacher // REx command line: XQueryTokenizer.ebnf -ll 2 -backtrack -tree -javascript -a xqlint // line 2 "XQueryTokenizer.ebnf" @@ -129,37 +129,38 @@ lookahead1W(14); // ModuleDecl | Annotation | OptionDecl | Operator | Variable | Tag | AttrTest | // Wildcard | EQName^Token | IntegerLiteral | DecimalLiteral | DoubleLiteral | // S^WS | EOF | '"' | "'" | '(' | '(#' | '(:' | '(:~' | ')' | ',' | '.' | '/' | - // '