beta 2011.09.17 09:40

1 files changed, 5 insertions, 157 deletions

diff --git a/context/data/scite/lexers/scite-context-lexer-cld.lua b/context/data/scite/lexers/scite-context-lexer-cld.lua
index 1abc55f91..632a7672c 100644
--- a/context/data/scite/lexers/scite-context-lexer-cld.lua
+++ b/context/data/scite/lexers/scite-context-lexer-cld.lua
@@ -6,166 +6,14 @@ local info = {
     license   = "see context related readme files",
 }
 
--- Adapted from lua.lua by Mitchell who based it on a lexer by Peter Odding.
-
 local lexer = lexer
-local token, style, colors, exact_match, no_style = lexer.token, lexer.style, lexer.colors, lexer.exact_match, lexer.style_nothing
-local P, R, S, C, Cg, Cb, Cs, Cmt = lpeg.P, lpeg.R, lpeg.S, lpeg.C, lpeg.Cg, lpeg.Cb, lpeg.Cs, lpeg.Cmt
-local match, find = string.match, string.find
-local global = _G
 
 module(...)
 
-local cldlexer = _M
-
-local keywords = {
-  'and', 'break', 'do', 'else', 'elseif', 'end', 'false', 'for', 'function',
-  'if', 'in', 'local', 'nil', 'not', 'or', 'repeat', 'return', 'then', 'true',
-  'until', 'while',
-}
-
-local functions = {
-  'assert', 'collectgarbage', 'dofile', 'error', 'getfenv', 'getmetatable',
-  'ipairs', 'load', 'loadfile', 'loadstring', 'module', 'next', 'pairs',
-  'pcall', 'print', 'rawequal', 'rawget', 'rawset', 'require', 'setfenv',
-  'setmetatable', 'tonumber', 'tostring', 'type', 'unpack', 'xpcall',
-}
-
-local constants = {
-  '_G', '_VERSION',
-}
-
-local csnames = {
-    "context",
-    "metafun",
-}
-
-local level         = nil
-local setlevel      = function(_,i,s) level = s return i end
-
-local equals        = P("=")^0
-
-local longonestart  = P("[[")
-local longonestop   = P("]]")
-local longonestring = (1-longonestop)^0
-
-local longtwostart  = P('[') * Cmt(equals,setlevel) * P('[')
-local longtwostop   = P(']') *     equals           * P(']')
-
-local longtwostring = P(function(input,index)
-    if level then
-        local sentinel = ']' .. level .. ']'
-        local _, stop = find(input,sentinel,index,true)
-        return stop and stop + 1 - #sentinel or #input + 1
-    end
-end)
-
--- local longtwostart  = P("[") * Cg(equals, "init") * P("[")
--- local longtwostop   = P("]") * C(equals) * P("]")
--- local longtwocheck  = Cmt(longtwostop * Cb("init"), function(s,i,a,b) return a == b end)
--- local longtwostring = (P(1) - longtwocheck)^0
-
-local longcomment = Cmt(#('[[' + ('[' * P('=')^0 * '[')), function(input,index)
-    local level = match(input,'^%[(=*)%[',index)
-    level = "=="
-    if level then
-        local _, stop = find(input,']' .. level .. ']',index,true)
-        return stop and stop + 1 or #input + 1
-    end
-end)
+local cldlexer = lexer.load('scite-context-lexer-lua')
 
-local longcomment =  Cmt(#('[[' + ('[' * C(P('=')^0) * '[')), function(input,index,level)
-    local _, stop = find(input,']' .. level .. ']',index,true)
-    return stop and stop + 1 or #input + 1
-end)
+_rules       = cldlexer._rules_cld
+_tokenstyles = cldlexer._tokenstyles
+_foldsymbols = cldlexer._foldsymbols
 
-local whitespace    = cldlexer.WHITESPACE -- triggers states
-
-local space         = lexer.space -- S(" \n\r\t\f\v")
-local any           = lexer.any
-
-local squote        = P("'")
-local dquote        = P('"')
-local escaped       = P("\\") * P(1)
-local dashes        = P('--')
-
-local spacing       = token(whitespace, space^1)
-local rest          = token("default",  any)
-
-local shortcomment  = dashes * lexer.nonnewline^0
-local longcomment   = dashes * longcomment
-local comment       = token("comment", longcomment + shortcomment)
-
-local shortstring   = token("quote",  squote)
-                    * token("string", (escaped + (1-squote))^0 )
-                    * token("quote",  squote)
-                    + token("quote",  dquote)
-                    * token("string", (escaped + (1-dquote))^0 )
-                    * token("quote",  dquote)
-
-local longstring    = token("quote",  longonestart)
-                    * token("string", longonestring)
-                    * token("quote",  longonestop)
-                    + token("quote",  longtwostart)
-                    * token("string", longtwostring)
-                    * token("quote",  longtwostop)
-
-local string        = shortstring
-                    + longstring
-
-local integer       = P('-')^-1 * (lexer.hex_num + lexer.dec_num)
-local number        = token("number", lexer.float + integer)
-
-local word          = R('AZ','az','__','\127\255') * (lexer.alnum + '_')^0
-local identifier    = token("default", word)
-
-local operator      = token("special", P('~=') + S('+-*/%^#=<>;:,.{}[]()')) -- maybe split of {}[]()
-
-local keyword       = token("keyword", exact_match(keywords))
-local builtin       = token("plain", exact_match(functions))
-local constant      = token("data", exact_match(constants))
-local csname        = token("user",         exact_match(csnames)) * (
-                        spacing^0 * #S("{(")
-                        + ( spacing^0 * token("special", P(".")) * spacing^0 * token("csname",word) )^1
-                    )
-
-_rules = {
-    { 'whitespace', spacing    },
-    { 'keyword',    keyword    },
-    { 'function',   builtin    },
-    { 'csname',     csname     },
-    { 'constant',   constant   },
-    { 'identifier', identifier },
-    { 'string',     string     },
-    { 'comment',    comment    },
-    { 'number',     number     },
-    { 'operator',   operator   },
-    { 'rest',       rest       },
-}
-
-_tokenstyles = lexer.context.styleset
-
-_foldsymbols = {
-    _patterns = {
-        '%l+',
-        '[%({%)}%[%]]',
-    },
-    ['keyword'] = {
-        ['if']       =  1,
-        ['end']      = -1,
-        ['do']       =  1,
-        ['function'] =  1,
-        ['repeat']   =  1,
-        ['until']    = -1,
-      },
-    ['comment'] = {
-        ['['] = 1, [']'] = -1,
-    },
-    ['quote'] = { -- to be tested
-        ['['] = 1, [']'] = -1,
-    },
-    ['special'] = {
-        ['('] = 1, [')'] = -1,
-        ['{'] = 1, ['}'] = -1,
-    },
-}
+_directives  = cldlexer._directives