wml_action 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmFjMGE1ODU2Y2NkNTU3NDQyYTdjZDg5ZjUwYzExMWY2MjM4MTlkOA==
-  data.tar.gz: !binary |-
-    YjU4MjFiNjBiYjlmZWYzNTFkYmQ3NjAyNDE2ZTMyZDk5YzQxNGYwZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWJkMDEzZjY0YzBlY2JjMWU5YmM5OTgyNzJhMjFiYWY1NjdhMjEyZWYwN2Yx
-    MjBjMGM1OWRjZGYwMDM3MzA3MTQyOGEwOTU5ZDJmYjI4ODZjZGFkNTM1MTcz
-    YzEyNzA3NmEwYTA5YzIxZDBmNDgzYzI5Y2E0YWIwZGQwYWRjMGQ=
-  data.tar.gz: !binary |-
-    YTlhMjJiYTU0Njk3MmIzYzMxNDZiM2E3ODI2MTFmODA2Y2QxNDQ1MjAwNDhl
-    MTcyMTRlMzllYzZiM2Y2NGVhN2Q5ZGIyNjExMDQzNWU4MjIxYTM4MTZhNTkz
-    N2IyOWQ2OGYyZTA4ZjE4NjJlYzU5YzY5ODdjNGMwNzAzZWQxNTU=
+SHA1:
+  metadata.gz: a0364cfffffdced1188beb5f62ac2c5cf6eefee0
+  data.tar.gz: 17347228d19ffa2cc46569ece2bd5fff95e914be
+SHA512:
+  metadata.gz: 05154a8857c5cf039180ee94aaf440148068564cf293d34ff4481eba76f1f4861ec086e3ece8b1a2d9b5b32ff1b7d2e1d8a41d45e89c1be9effc1b949405b4bb
+  data.tar.gz: e3d5376b9a88ba33f20ffd3c220e81bfc1b16633a9db492076578a4b8fd08e1684241c40810919a01162c0ccb950da757ee0606c4ff27a84179a7984cc5910b1

data/README.md

@@ -4,7 +4,7 @@ WMLAction is WML parser and modifier. WML modifications described as simple exte
 
 ## Features
 
-### Changing/adding attributes:
+### Changing/adding attributes
 File:
 ```
 [unit]
@@ -18,7 +18,7 @@ Modifications:
   hp=25
   race="human"
   {REGENERATES}
-[unit]
+[/unit]
 ```
 Becomes:
 ```
@@ -27,7 +27,7 @@ Becomes:
   level=1
   race="human"
   {REGENERATES}
-[unit]
+[/unit]
 ```
 ### Adding tags
 File:
@@ -86,6 +86,28 @@ Becomes:
 [/unit]
 ```
 
+### Expressions
+File:
+```
+[unit]
+  hp=10
+  level=2
+[/unit]
+```
+Modifications:
+```
+[unit]
+  hp=`(hp+level)*2`
+[/unit]
+```
+Becomes:
+```
+[unit]
+  hp=24
+  level=2
+[/unit]
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/features/wml_action.feature

@@ -0,0 +1,27 @@
+Feature: WMLAction
+  In order to keep my Wesnoth mod up to date
+  As a ERA author
+  I want to make quick modifications to many WML files
+
+  Scenario: Add and change attributes
+    Given a file named "attrs.cfg" with:
+    [unit]
+      hp=10
+      level=1
+    [/unit]
+    And a file named "attr_mod.cfg" with:
+    [unit]
+      hp=25
+      race="human"
+      {REGENERATES}
+    [unit]
+    When I run "wml_action modify attrs.cfg attr_mod.cfg"
+    Then the output should be:
+    [unit]
+      hp=25
+      level=1
+      race="human"
+      {REGENERATES}
+    [unit]
+
+

data/lib/wml_action/expr.rb

@@ -0,0 +1,74 @@
+module WMLAction
+
+  class Tag::Expr
+
+    attr_accessor :line
+
+    Var = Struct.new(:name) do
+        def to_s
+            name.to_s
+        end
+    end
+
+    Op = Struct.new(:value) do
+        def to_s
+            value.to_s
+        end
+    end
+
+
+    def initialize(elements)
+      @line = elements
+    end
+
+    def result(vars={})
+        return '' if @line.empty?
+        stack=[]
+        @line.each do |e|
+            case e
+            when Var then stack.push vars[e.name]
+            when Op then
+                x2 = stack.pop
+                x1 = stack.pop
+                raise SyntaxError.new("Invalid expression #{dump}, no values in stack") unless x1 && x2
+                case e.value
+                when '+' then stack.push(x1+x2)
+                when '-' then stack.push(x1-x2)
+                when '*' then stack.push(x1.to_f*x2)
+                when '/' then stack.push(x1.to_f/x2)
+                else raise NoMethodError.new("No such operation #{e.value}")
+                end
+            else stack.push e
+            end
+        end
+        raise SyntaxError.new("Invalid expression #{dump}, still have #{stack.size} values") unless stack.size == 1
+        return stack[0].to_i if stack[0].class==Float
+        return stack[0]
+    end
+
+    def ==(other)
+        @line==other.line
+    end
+
+    def to_s
+        #TODO should revert to infix notation for file output
+        # needed to read outputted file
+        dump
+    end
+
+    def dump
+        @line.join(' ')
+    end
+
+    def <<(other)
+        @line=@line+other.line
+        return self
+    end
+
+    def self.[](*elements)
+        new elements
+    end
+
+  end
+
+end

data/lib/wml_action/lexer.rex

@@ -13,11 +13,13 @@ macro
     CTAG    /\[\/(\w+)\]/
     ATTR    /(\w+)=/
     MACRO   /\{.+\}/
-    ANUMBER /-?\d+/
+    ANUMBER /-?\d+(\.\d+)?/
     ASTR    /"[^"]*"/
     APLAIN  /.+/
     SLASH   /\//
     COMMENT /\#.*$/
+    BACKQ   /\`/
+    VAR     /[\w]+/
 
     BLANK   /[ \t]+/
 
@@ -39,8 +41,20 @@ rule
     :INATTR /#{MACRO}/          { [:AMACRO, text] }
     :INATTR /_/                 { [:UNDERSC, text] }
     :INATTR /\+/                { [:APLUS, text] }
+    :INATTR /#{BACKQ}/          { @state = :INEXPR; [:BACKQ, text] }
     :INATTR /#{APLAIN}/         { [:APLAIN, text] }
 
+    :INEXPR /#{BACKQ}/          { @state = nil; [:BACKQ, text] }
+    :INEXPR /\+/                { [:EPLUS,text] }
+    :INEXPR /\*/                { [:EMUL,text] } 
+    :INEXPR /\//                { [:EDIV,text] }
+    :INEXPR /\-/                { [:EMINUS,text] }
+    :INEXPR /\(/                { [text,text] }
+    :INEXPR /\)/                { [text,text] }
+    :INEXPR /#{ANUMBER}/        { [:ENUM,text.to_f] }
+    :INEXPR /#{ASTR}/           { [:ESTR,text] }
+    :INEXPR /#{VAR}/            { [:EVAR,text] }
+
             /./
             /\n/
 

data/lib/wml_action/lexer.rex.rb

@@ -16,11 +16,13 @@ class Parser < Racc::Parser
   CTAG    = /\[\/(\w+)\]/
   ATTR    = /(\w+)=/
   MACRO   = /\{.+\}/
-  ANUMBER = /-?\d+/
+  ANUMBER = /-?\d+(\.\d+)?/
   ASTR    = /"[^"]*"/
   APLAIN  = /.+/
   SLASH   = /\//
   COMMENT = /\#.*$/
+  BACKQ   = /\`/
+  VAR     = /[\w]+/
   BLANK   = /[ \t]+/
 
   class ScanError < StandardError ; end
@@ -110,12 +112,40 @@ class Parser < Racc::Parser
             action { [:UNDERSC, text] }
           when text = ss.scan(/\+/) then
             action { [:APLUS, text] }
+          when text = ss.scan(/#{BACKQ}/) then
+            action { @state = :INEXPR; [:BACKQ, text] }
           when text = ss.scan(/#{APLAIN}/) then
             action { [:APLAIN, text] }
           else
             text = ss.string[ss.pos .. -1]
             raise ScanError, "can not match (#{state.inspect}): '#{text}'"
           end
+        when :INEXPR then
+          case
+          when text = ss.scan(/#{BACKQ}/) then
+            action { @state = nil; [:BACKQ, text] }
+          when text = ss.scan(/\+/) then
+            action { [:EPLUS,text] }
+          when text = ss.scan(/\*/) then
+            action { [:EMUL,text] } 
+          when text = ss.scan(/\//) then
+            action { [:EDIV,text] }
+          when text = ss.scan(/\-/) then
+            action { [:EMINUS,text] }
+          when text = ss.scan(/\(/) then
+            action { [text,text] }
+          when text = ss.scan(/\)/) then
+            action { [text,text] }
+          when text = ss.scan(/#{ANUMBER}/) then
+            action { [:ENUM,text.to_f] }
+          when text = ss.scan(/#{ASTR}/) then
+            action { [:ESTR,text] }
+          when text = ss.scan(/#{VAR}/) then
+            action { [:EVAR,text] }
+          else
+            text = ss.string[ss.pos .. -1]
+            raise ScanError, "can not match (#{state.inspect}): '#{text}'"
+          end
         else
           raise ScanError, "undefined state: '#{state}'"
         end # token = case state