yay 0.0.4 → 0.0.5

data/data/yay/log4x.yay

@@ -14,5 +14,5 @@ important is @serious
 
 @boring are dim lines
 @normal is normal
-@interesting is yellow
-@serious is an inverted red line
+@interesting is inverted yellow
+@serious is a inverted red

data/data/yay/syslog.yay

@@ -1,16 +1,14 @@
 #!/usr/bin/yay
 # Highlights syslog messages
 
-debug is normal
-informational is gray
-notice and warning are yellow
-error and alert are red
-critical and emergency are red lines
+debug, dbg are @boring
+/info(rmational)?/i are @normal
+notice, /warn(ing)?/i are @interesting
+/err(or)?/i and alert are @serious
+/crit(ical)?/i, /emerg(ency)?/i are @serious
 
-# some aliases
-dbg is normal
-info is gray
-notice and warn are yellow
-err and alert
-crit and emerg are red lines
+@boring is dim
+@normal is normal
+@interesting is inverted yellow
+@serious is inverted red
 

data/lib/yay/parser.rb

@@ -64,7 +64,7 @@ class Yay
     end
 
     def handle_regex string
-      return string_to_regex string
+      return string_to_regex string, false
     end
 
     # for lack of a better function, this will take the ending sequence from
@@ -86,10 +86,11 @@ class Yay
     
     # for lack of a better function, this will take a string like "/abc/" and
     # transform it in to a regex object
-    def string_to_regex string
+    def string_to_regex string, escape=true
       matches = /\/([^\/\\\r\n]*(?:\\.[^\/\\\r\n]*)*)\/([a-z]\b)*/.match string
       return nil if matches[1].nil?
-      content = Regexp::escape(matches[1])
+      content = matches[1]
+	  content = Regexp::escape(content) if escape
       options = extract_regexp_options matches[2]
       return Regexp.new(content, options)
     end
@@ -151,4 +152,4 @@ class Yay
       raise Yay::UnexpectedTokenError.new type, error_value, current_position
     end
   end
-end
+end

data/lib/yay/parser_gen.rb

@@ -1,53 +1,18 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "./../data/grammar.y".
+# This file is automatically generated by Racc 1.4.7
+# from Racc grammer file "".
 #
 
-require 'racc/parser'
-
+require 'racc/parser.rb'
 
 class Yay
-
 class ParserGen < Racc::Parser
 
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 13, :_reduce_none,
- 1, 13, :_reduce_2,
- 2, 13, :_reduce_3,
- 1, 13, :_reduce_4,
- 0, 13, :_reduce_5,
- 3, 14, :_reduce_none,
- 1, 14, :_reduce_none,
- 1, 15, :_reduce_none,
- 1, 15, :_reduce_none,
- 1, 15, :_reduce_none,
- 1, 15, :_reduce_none,
- 1, 15, :_reduce_none,
- 4, 17, :_reduce_13,
- 3, 18, :_reduce_14,
- 4, 19, :_reduce_15,
- 3, 20, :_reduce_16,
- 2, 21, :_reduce_17,
- 3, 22, :_reduce_18,
- 1, 22, :_reduce_19,
- 1, 26, :_reduce_20,
- 1, 26, :_reduce_21,
- 2, 24, :_reduce_22,
- 1, 24, :_reduce_23,
- 1, 16, :_reduce_24,
- 0, 16, :_reduce_none,
- 1, 25, :_reduce_26,
- 0, 25, :_reduce_27,
- 2, 23, :_reduce_28,
- 0, 23, :_reduce_none ]
+module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 54)
 
-racc_reduce_n = 30
-
-racc_shift_n = 40
+...end grammar.y/module_eval...
+##### State transition tables begin ###
 
 racc_action_table = [
     -7,   -25,    32,    17,    25,    17,   -25,    12,    22,    22,
@@ -91,231 +56,292 @@ racc_goto_default = [
    nil,   nil,   nil,     7,   nil,    11,    13,    14,    15,    16,
      1,   nil,   nil,   nil,     6 ]
 
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :literal => 2,
- :install => 3,
- :list_installed => 4,
- :variable => 5,
- :include => 6,
- :regex => 7,
- :colour => 8,
- :and => 9,
- :line => 10,
- :verb => 11 }
+racc_reduce_table = [
+  0, 0, :racc_error,
+  1, 13, :_reduce_1,
+  1, 13, :_reduce_2,
+  2, 13, :_reduce_3,
+  1, 13, :_reduce_4,
+  0, 13, :_reduce_5,
+  3, 14, :_reduce_6,
+  1, 14, :_reduce_7,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  4, 17, :_reduce_13,
+  3, 18, :_reduce_14,
+  4, 19, :_reduce_15,
+  3, 20, :_reduce_16,
+  2, 21, :_reduce_17,
+  3, 22, :_reduce_18,
+  1, 22, :_reduce_19,
+  1, 26, :_reduce_20,
+  1, 26, :_reduce_21,
+  2, 24, :_reduce_22,
+  1, 24, :_reduce_23,
+  1, 16, :_reduce_24,
+  0, 16, :_reduce_25,
+  1, 25, :_reduce_26,
+  0, 25, :_reduce_27,
+  2, 23, :_reduce_28,
+  0, 23, :_reduce_29 ]
 
-racc_use_result_var = true
+racc_reduce_n = 30
+
+racc_shift_n = 40
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :literal => 2,
+  :install => 3,
+  :list_installed => 4,
+  :variable => 5,
+  :include => 6,
+  :regex => 7,
+  :colour => 8,
+  :and => 9,
+  :line => 10,
+  :verb => 11 }
 
 racc_nt_base = 12
 
+racc_use_result_var = true
+
 Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
 
 Racc_token_to_s_table = [
-'$end',
-'error',
-'literal',
-'install',
-'list_installed',
-'variable',
-'include',
-'regex',
-'colour',
-'and',
-'line',
-'verb',
-'$start',
-'body',
-'command_list',
-'command',
-'and_opt',
-'match',
-'assignment',
-'substitution',
-'equivalence',
-'include_file',
-'string_list',
-'verbs_opt',
-'colour_list',
-'line_opt',
-'string']
+  "$end",
+  "error",
+  "literal",
+  "install",
+  "list_installed",
+  "variable",
+  "include",
+  "regex",
+  "colour",
+  "and",
+  "line",
+  "verb",
+  "$start",
+  "body",
+  "command_list",
+  "command",
+  "and_opt",
+  "match",
+  "assignment",
+  "substitution",
+  "equivalence",
+  "include_file",
+  "string_list",
+  "verbs_opt",
+  "colour_list",
+  "line_opt",
+  "string" ]
 
 Racc_debug_parser = false
 
-##### racc system variables end #####
+##### State transition tables end #####
 
- # reduce 0 omitted
+# reduce 0 omitted
 
- # reduce 1 omitted
+module_eval(<<'.,.,', 'grammar.y', 5)
+  def _reduce_1(val, _values, result)
+      
+    result
+  end
+.,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 6
-  def _reduce_2( val, _values, result )
- include_file val[0]
-   result
+module_eval(<<'.,.,', 'grammar.y', 6)
+  def _reduce_2(val, _values, result)
+     include_file val[0] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 7
-  def _reduce_3( val, _values, result )
- install_file val[1]
-   result
+module_eval(<<'.,.,', 'grammar.y', 7)
+  def _reduce_3(val, _values, result)
+     install_file val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 8
-  def _reduce_4( val, _values, result )
- list_installed
-   result
+module_eval(<<'.,.,', 'grammar.y', 8)
+  def _reduce_4(val, _values, result)
+     list_installed 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 9
-  def _reduce_5( val, _values, result )
- use_default_file
-   result
+module_eval(<<'.,.,', 'grammar.y', 9)
+  def _reduce_5(val, _values, result)
+     use_default_file 
+    result
   end
 .,.,
 
- # reduce 6 omitted
+module_eval(<<'.,.,', 'grammar.y', 11)
+  def _reduce_6(val, _values, result)
+      
+    result
+  end
+.,.,
 
- # reduce 7 omitted
+module_eval(<<'.,.,', 'grammar.y', 12)
+  def _reduce_7(val, _values, result)
+      
+    result
+  end
+.,.,
 
- # reduce 8 omitted
+# reduce 8 omitted
 
- # reduce 9 omitted
+# reduce 9 omitted
 
- # reduce 10 omitted
+# reduce 10 omitted
 
- # reduce 11 omitted
+# reduce 11 omitted
 
- # reduce 12 omitted
+# reduce 12 omitted
 
-module_eval <<'.,.,', './../data/grammar.y', 20
-  def _reduce_13( val, _values, result )
- @ruleset.add_match val[0], handle_colours(val[2]), val[3]
-   result
+module_eval(<<'.,.,', 'grammar.y', 20)
+  def _reduce_13(val, _values, result)
+     @ruleset.add_match val[0], handle_colours(val[2]), val[3] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 22
-  def _reduce_14( val, _values, result )
- @ruleset.add_assignment val[0], val[2]
-   result
+module_eval(<<'.,.,', 'grammar.y', 22)
+  def _reduce_14(val, _values, result)
+     @ruleset.add_assignment val[0], val[2] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 24
-  def _reduce_15( val, _values, result )
- @ruleset.add_substitution val[0], handle_colours(val[2]), val[3]
-   result
+module_eval(<<'.,.,', 'grammar.y', 24)
+  def _reduce_15(val, _values, result)
+     @ruleset.add_substitution val[0], handle_colours(val[2]), val[3] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 26
-  def _reduce_16( val, _values, result )
- @ruleset.add_equivalence val[0], val[2]
-   result
+module_eval(<<'.,.,', 'grammar.y', 26)
+  def _reduce_16(val, _values, result)
+     @ruleset.add_equivalence val[0], val[2]  
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 28
-  def _reduce_17( val, _values, result )
- include_file val[1]
-   result
+module_eval(<<'.,.,', 'grammar.y', 28)
+  def _reduce_17(val, _values, result)
+     include_file val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 30
-  def _reduce_18( val, _values, result )
- val[2].unshift(val[0]); result = val[2]
-   result
+module_eval(<<'.,.,', 'grammar.y', 30)
+  def _reduce_18(val, _values, result)
+     val[2].unshift(val[0]); result = val[2] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 31
-  def _reduce_19( val, _values, result )
- result = [val[0]]
-   result
+module_eval(<<'.,.,', 'grammar.y', 31)
+  def _reduce_19(val, _values, result)
+     result = [val[0]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 33
-  def _reduce_20( val, _values, result )
- result = handle_string(val[0])
-   result
+module_eval(<<'.,.,', 'grammar.y', 33)
+  def _reduce_20(val, _values, result)
+     result = handle_string(val[0]) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 34
-  def _reduce_21( val, _values, result )
- result = handle_regex(val[0])
-   result
+module_eval(<<'.,.,', 'grammar.y', 34)
+  def _reduce_21(val, _values, result)
+     result = handle_regex(val[0]) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 36
-  def _reduce_22( val, _values, result )
- val[1].unshift(val[0].to_sym); result = val[1]
-   result
+module_eval(<<'.,.,', 'grammar.y', 36)
+  def _reduce_22(val, _values, result)
+     val[1].unshift(val[0].to_sym); result = val[1] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 37
-  def _reduce_23( val, _values, result )
- result = [val[0].to_sym]
-   result
+module_eval(<<'.,.,', 'grammar.y', 37)
+  def _reduce_23(val, _values, result)
+     result = [val[0].to_sym] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 39
-  def _reduce_24( val, _values, result )
- result = nil
-   result
+module_eval(<<'.,.,', 'grammar.y', 39)
+  def _reduce_24(val, _values, result)
+     result = nil 
+    result
   end
 .,.,
 
- # reduce 25 omitted
+module_eval(<<'.,.,', 'grammar.y', 40)
+  def _reduce_25(val, _values, result)
+     
+    result
+  end
+.,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 42
-  def _reduce_26( val, _values, result )
- result = true
-   result
+module_eval(<<'.,.,', 'grammar.y', 42)
+  def _reduce_26(val, _values, result)
+     result = true 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 43
-  def _reduce_27( val, _values, result )
- result = false
-   result
+module_eval(<<'.,.,', 'grammar.y', 43)
+  def _reduce_27(val, _values, result)
+     result = false 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', './../data/grammar.y', 45
-  def _reduce_28( val, _values, result )
- result = nil
-   result
+module_eval(<<'.,.,', 'grammar.y', 45)
+  def _reduce_28(val, _values, result)
+     result = nil 
+    result
   end
 .,.,
 
- # reduce 29 omitted
+module_eval(<<'.,.,', 'grammar.y', 46)
+  def _reduce_29(val, _values, result)
+     
+    result
+  end
+.,.,
 
- def _reduce_none( val, _values, result )
-  result
- end
+def _reduce_none(val, _values, result)
+  val[0]
+end
 
 end   # class ParserGen
 

data/lib/yay/version.rb

@@ -2,7 +2,7 @@ require 'open3'
 
 class Yay
 
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 
 	def self.version
 		@rev ||= begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yay
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - jon davey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 +00:00
+date: 2011-11-18 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -30,21 +30,21 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - data/yay/default.yay
-- data/yay/log4x.yay
 - data/yay/syslog.yay
-- lib/yay/colourizer.rb
-- lib/yay/application.rb
-- lib/yay/version.rb
+- data/yay/log4x.yay
+- lib/yay/lexer.rb
+- lib/yay/parser.rb
 - lib/yay/parser_gen.rb
-- lib/yay/lexer_regex.rb
 - lib/yay/errors.rb
-- lib/yay/parser.rb
-- lib/yay/loader.rb
-- lib/yay/paths.rb
 - lib/yay/colour_wheel.rb
-- lib/yay/installer.rb
+- lib/yay/lexer_regex.rb
+- lib/yay/paths.rb
+- lib/yay/version.rb
+- lib/yay/application.rb
+- lib/yay/loader.rb
 - lib/yay/rule_set.rb
-- lib/yay/lexer.rb
+- lib/yay/colourizer.rb
+- lib/yay/installer.rb
 - bin/yay
 has_rdoc: true
 homepage: http://github.com/jond3k/yay