broomhlda 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a9585d07f566041aaa2f64eb3c39d8549659b0
-  data.tar.gz: f177b9a4c5037651d946fed5b778701199732973
+  metadata.gz: 5841f61e93c8c3411d7941da19ccf65387695007
+  data.tar.gz: ecc7612997c65556d44c23a7b8b581e6a5c7ffa9
 SHA512:
-  metadata.gz: db598fbeb791fb044348c1a28925edee938c043ed4a235170b6ac2c4c90c7059e1d8ae6e98c371d1b3209c76e420975667b3222f37636c726d51ab058a51d152
-  data.tar.gz: 8cc5f90657ff5fcf48e722bc0daa958bceb7f449d17f17b3153e74fb39b8c3ff21453546bec350d9a4a32c90d6f845b544c9e85ea039775e7762a09469bcf93e
+  metadata.gz: 3dc935718a23fe89c7c9e1ce166d70679098836c14afd10d86a90d16fed739dd67f2e949af795900503521ca5eadbd2881db32b98297b6af719e932f2fefcb52
+  data.tar.gz: 2a8f6a62d8005ba9404b69983c4cd8e1aca320056d2d60ce298fce3a8a8474de2f2283081d36ab5976646a03a2f7462bb73ca6da4dde425c21007179d18d3a9c

data/lib/hl/lexers/bash.ay

@@ -0,0 +1,63 @@
+use(require("atomy"))
+use(require("hl/define"))
+
+lexer = lexer:
+  name: "Bash"
+  aliases: ["bash", "sh", "ksh"]
+  extensions: [".sh", ".ksh", ".bash", ".ebuild", ".eclass", ".bashrc", "bashrc", ".bash_", "bash_"]
+  mimetypes: ["application/x-sh", "application/x-shellscript"]
+  start: .root
+  flags: 0
+
+  lex(curly):
+    r"}" is(keyword) -> pop
+    r":-" is(keyword)
+    r"[a-zA-Z0-9_]+" is(name.variable)
+    r"[^}:\"\'`$]+" is(punctuation)
+    r":" is(punctuation)
+    any-of(root)
+
+  lex(backticks):
+    r"`" is(literal.string.backtick) -> pop
+    any-of(root)
+
+  lex(root):
+    any-of(basic)
+    r"\$\(\(" is(keyword) -> go-to(math)
+    r"\$\(" is(keyword) -> go-to(paren)
+    r"\${\#?" is(keyword) -> go-to(curly)
+    r"`" is(literal.string.backtick) -> go-to(backticks)
+    any-of(data)
+
+  lex(basic):
+    r"\b(if|fi|else|while|do|done|for|then|return|function|case|select|continue|until|esac|elif)\s*\b" is(keyword)
+    r"\b(alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|declare|dirs|disown|echo|enable|eval|exec|exit|export|false|fc|fg|getopts|hash|help|history|jobs|kill|let|local|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|time|times|trap|true|type|typeset|ulimit|umask|unalias|unset|wait)\s*\b(?!\.)" is(name.builtin)
+    r"\#.*$" is(comment)
+    r"\\[\w\W]" is(literal.string.escape)
+    r"(\b\w+)(\s*)(=)" is(by-groups(name.variable, text, operator))
+    r"[\[\]{}()=]" is(operator)
+    r"<<<" is(operator)
+    r"<<-?\s*(\'?)\\?(\w+)[\w\W]+?\2" is(literal.string)
+    r"&&|\|\|" is(operator)
+
+  lex(paren):
+    r"\)" is(keyword) -> pop
+    any-of(root)
+
+  lex(data):
+    r"(?m)\$?\"(\\\\|\\[0-7]+|\\.|[^\"\\])*\"" is(literal.string.double)
+    r"(?m)\$?'(\\\\|\\[0-7]+|\\.|[^'\\])*'" is(literal.string.single)
+    r";" is(text)
+    r"\s+" is(text)
+    r"[^=\s\[\]{}()$\"\'`\\<]+" is(text)
+    r"\d+(?= |\Z)" is(literal.number)
+    r"\$\#?(\w+|.)" is(name.variable)
+    r"<" is(text)
+
+  lex(math):
+    r"\)\)" is(keyword) -> pop
+    r"[-+*/%^|&]|\*\*|\|\|" is(operator)
+    r"\d+" is(literal.number)
+    any-of(root)
+
+const-set(.Lexer, lexer)

data/lib/hl/lexers/yaml.ay

@@ -126,7 +126,7 @@ lexer = lexer:
 
   lex(block-line):
     -- the line end
-    r"[ ]*(?=#|$)" is(text) -> pop -- something(Text)
+    r"[ ]*(?=#|$)" is(text) -> pop
 
     -- whitespaces separating tokens
     r"[ ]+" is(text)
@@ -141,7 +141,7 @@ lexer = lexer:
     any-of(flow-nodes)
 
     -- a plain scalar
-    r"(?=[^\s?:,\[\]{}#&*!|>'\"%@`-]|[?:-]\S)" is(name.variable) => plain-scalar-in-block-context -- something(Name.Variable)
+    r"(?=[^\s?:,\[\]{}#&*!|>'\"%@`-]|[?:-]\S)" is(name.variable) => plain-scalar-in-block-context
 
 
   lex(descriptors):
@@ -307,7 +307,7 @@ lexer = lexer:
 
   lex(plain-scalar-in-block-context):
     -- the scalar ends with the ':' indicator
-    r"[ ]*(?=:[ ]|:$)" is(text) -> pop -- something(Text)
+    r"[ ]*(?=:[ ]|:$)" is(text) -> pop
 
     -- the scalar ends with whitespaces followed by a comment
     r"[ ]+(?=#)" is(text) -> pop
@@ -321,13 +321,18 @@ lexer = lexer:
     -- other whitespaces are a part of the value
     r"[ ]+" is(literal.scalar.plain)
 
+    any-of(constants)
+
+    -- regular non-whitespace characters acting as a key
+    r"(?::(?!\s)|[^\s:])+(?=:( |$))" is(name.property)
+
     -- regular non-whitespace characters
-    r"(?::(?!\s)|[^\s:])+" is(name.property) --literal.scalar.plain)
+    r"(?::(?!\s)|[^\s:])+" is(name.variable)
 
 
   lex(plain-scalar-in-flow-context):
     -- the scalar ends with an indicator character
-    r"[ ]*(?=[,:?\[\]{}])" is(text) -> pop -- something(Text)
+    r"[ ]*(?=[,:?\[\]{}])" is(text) -> pop
 
     -- the scalar ends with a comment
     r"[ ]+(?=#)" is(text) -> pop
@@ -342,7 +347,18 @@ lexer = lexer:
     -- other whitespaces are a part of the value
     r"[ ]+" is(name.variable)
 
+    any-of(constants)
+
+    -- regular non-whitespace characters acting as a key
+    r"[^\s,:?\[\]{}]+(?=:( |$))" is(name.property)
+
     -- regular non-whitespace characters
     r"[^\s,:?\[\]{}]+" is(name.variable)
 
+
+  lex(constants):
+    r"\b(~|null|Null|NULL)\b" is(keyword.constant)
+    r"\b(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\b" is(keyword.constant)
+
+
 const-set(.Lexer, lexer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: broomhlda
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomy
@@ -52,6 +52,7 @@ files:
 - lib/hl/formatters/html.ay
 - lib/hl/lexer.ay
 - lib/hl/lexers/atomy.ay
+- lib/hl/lexers/bash.ay
 - lib/hl/lexers/haskell.ay
 - lib/hl/lexers/imported/abap.ay
 - lib/hl/lexers/imported/actionscript.ay