Signed-off-by: Brice Figureau <[email protected]>
---
 lib/puppet/parser/grammar.ra |    2 +
 lib/puppet/parser/parser.rb  | 1546 +++++++++++++++++++++---------------------
 2 files changed, 773 insertions(+), 775 deletions(-)

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 4c5d320..bb75ecf 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -10,10 +10,12 @@ token QMARK LPAREN RPAREN ISEQUAL GREATEREQUAL GREATERTHAN 
LESSTHAN
 token IF ELSE IMPORT DEFINE ELSIF VARIABLE CLASS INHERITS NODE BOOLEAN
 token NAME SEMIC CASE DEFAULT AT LCOLLECT RCOLLECT CLASSNAME CLASSREF
 token NOT OR AND UNDEF PARROW PLUS MINUS TIMES DIV LSHIFT RSHIFT UMINUS
+token MATCH NOMATCH REGEX
 
 prechigh
     right NOT
     nonassoc UMINUS
+    left  MATCH NOMATCH
     left  TIMES DIV
     left  MINUS PLUS
     left  LSHIFT RSHIFT
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index feb8436..6f4895a 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
<Patch elided because auto-generated>
-- 
1.6.0.2


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to