From b82ed14da99a8f888309c8001f38c5571bf8516e Mon Sep 17 00:00:00 2001 From: Jonas Rosling Date: Tue, 3 Jul 2012 14:48:49 +0200 Subject: [PATCH 1/3] fixed the strings --- erlang.jsf | 69 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/erlang.jsf b/erlang.jsf index ea4138b..4f58549 100644 --- a/erlang.jsf +++ b/erlang.jsf @@ -1,26 +1,33 @@ # JOE syntax highlight file for Erlang =Idle -=Comment green -=Constant cyan -=Escape bold cyan +=Comment fg_030 +=String fg_110 +=String_mod fg_300 bold +=Int fg_033 +=Record fg_530 +=Recatt fg_530 +=Fun fg_115 +=Module fg_101 =Keyword bold -=Bad bold red -=Brace magenta +=Brace fg_555 bold +=Brack fg_222 =Variable fg_310 -=Attribute magenta +=Attribute fg_505 :idle Idle * idle - "A-Z" variable noeat + "A-Z_" variable noeat "%" line_comment noeat "\"" string recolor=-1 "'" quoted_atom recolor=-1 "0-9" decimal recolor=-1 - "{[]}" brace recolor=-1 + "[]" brack recolor=-1 + "{}" brace recolor=-1 "-" maybe_attribute mark - "a-z" atom buffer + "a-z" atom buffer mark noeat + "#" record recolor=-1 :line_comment Comment * line_comment @@ -28,28 +35,50 @@ :variable Variable * idle noeat - "a-zA-Z" variable + "a-zA-Z0-9_" variable -:string Constant +:record Record + * idle noeat + "a-zA-z_" record + "." recatt recolor=-1 + +:recatt Recatt + * idle noeat + "a-zA-Z_" recatt + +:string String * string + "\\" string_escape + "~" string_mod recolor=-1 "\"" idle -:decimal Constant +:string_escape String + * string + "\"" string + +:string_mod String_mod + * string noeat recolor=-2 + "cfegswpWPBX#bx+ni" string + +:decimal Int * idle noeat "0-9" decimal "." float -:float Constant +:float Int * idle noeat "0-9" float :brace Brace * idle noeat +:brack Brack + * idle noeat + :maybe_attribute Idle * idle noeat - "a-z" maybe_attribute - "(" attribute recolormark + "a-z_" maybe_attribute + "(." attribute recolormark noeat :attribute Attribute * idle noeat @@ -84,9 +113,17 @@ "try" kw "when" kw "xor" kw -done +done + "(" function recolormark noeat + ":" module recolormark noeat "a-zA-Z0-9_@" atom +:module Module + * idle noeat + +:function Fun + * idle noeat + :kw Keyword * idle noeat From 926741ff07d4269c545662092d6c76405672f745 Mon Sep 17 00:00:00 2001 From: Jonas Rosling Date: Tue, 3 Jul 2012 16:02:37 +0200 Subject: [PATCH 2/3] pimped the sempi broken strings --- erlang.jsf | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/erlang.jsf b/erlang.jsf index 4f58549..90016bc 100644 --- a/erlang.jsf +++ b/erlang.jsf @@ -4,6 +4,7 @@ =Comment fg_030 =String fg_110 =String_mod fg_300 bold +=String_esc fg_024 bold =Int fg_033 =Record fg_530 =Recatt fg_530 @@ -46,20 +47,36 @@ * idle noeat "a-zA-Z_" recatt +# STRINGS :string String * string - "\\" string_escape - "~" string_mod recolor=-1 + "\\" string_escape recolor=-1 + "~" string_ mark "\"" idle -:string_escape String +:string_escape String_esc * string - "\"" string -:string_mod String_mod - * string noeat recolor=-2 - "cfegswpWPBX#bx+ni" string +:string_ String + * string_mod noeat + "0-9" string_f + "t" string_mod +:string_f String + * string_mod noeat + "0-9*" string_f + "." string_p +:string_p String + * string_mod noeat + "0-9*" string_p + +:string_mod String + * string + "cfegswpWPBX#bx+ni" string_modifier recolormark noeat + +:string_modifier String_mod + * string +# END STRINGS :decimal Int * idle noeat "0-9" decimal From ea126cdf41977f9c5648f972764d23f284c8b902 Mon Sep 17 00:00:00 2001 From: Jonas Rosling Date: Tue, 3 Jul 2012 16:03:34 +0200 Subject: [PATCH 3/3] pimped the sempi broken strings --- erlang.jsf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.jsf b/erlang.jsf index 90016bc..99f338e 100644 --- a/erlang.jsf +++ b/erlang.jsf @@ -3,8 +3,8 @@ =Idle =Comment fg_030 =String fg_110 -=String_mod fg_300 bold -=String_esc fg_024 bold +=String_mod fg_200 bold +=String_esc fg_000 bold =Int fg_033 =Record fg_530 =Recatt fg_530