maxy-gen 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf1d556c1b563928dac5451b7e431034ab0265f1599a6f075c2fbe9cea47777
-  data.tar.gz: 29b360138505a3700dc6a38abc8ac989673a0bb0a42c18484733eccfe994b1eb
+  metadata.gz: 5207d413af11f892c06645d4a52eb920dc9fdb131bea13311d13285754609b33
+  data.tar.gz: 2fb7405ad16c771c903a0eb6af81947bb577aa528ccf70d62c24a98c6e7a29a1
 SHA512:
-  metadata.gz: 5930cfb96c88d5deb47e186f685dbb3cb113609cca68d4fae099e2a6ac854a21c12e41467eae434cb1523f0378554a6d5bef1a625c282b39ed341c0cf7833bb5
-  data.tar.gz: 3e55e67c6e5b0c246c4edb0be123f57cbf6b5c6fd0ace130cf4b67f0b68328576e9e6e4b88079e9fa306b3d62da7e1d8605a6a9fad23fd13880b92aca9b6b799
+  metadata.gz: 4ccd516764930052b407fcf3c2bc4cea320292e9f980eda73cc9e7cf5a1d43ba72a682826e8600a7dad82cef54c7d603127ced8e27b4ae5739cd7f35ad3f6787
+  data.tar.gz: 3fa95ba2e3289e5ef500d3d86c4b030e241886880124053822b08f1a43dacf9e166bf655609b01598dbb2c7c1a78d1917b31c87cf4a47aa2c187433dd472eedf

data/lib/maxy/gen/generator.rb

@@ -17,15 +17,17 @@ module Maxy
         raise RuntimeError.new('No object definitions were found. please run `maxy-gen install` first') unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
 
         @object_count = 1
-        @patch = Psych.load_file(File.join(__dir__, '../../../assets/blank.yml')).freeze
-        @library = Psych.load_file("#{ENV['HOME']}/.maxy-gen/library.yml").freeze
+        @patch = Psych.load_file(File.join(__dir__, '../../../assets/blank.yml')).dup
+        @library = Psych.load_file("#{ENV['HOME']}/.maxy-gen/library.yml").dup
       end
 
-      def generate(node)
-        return JSON.generate(@patch) if node.nil?
+      def generate(root_node)
+        return JSON.generate(@patch) if root_node.nil?
 
-        node = align_tree(node)
+        node = align_tree(root_node.child_nodes[0])
         generate_node(node, "obj_#{@object_count}")
+        @patch['patcher']['boxes'].compact!
+        @patch['patcher']['lines'].compact!
         JSON.generate(@patch)
       end
 
@@ -38,13 +40,12 @@ module Maxy
           generate_node(child_node, child_id)
           @patch['patcher']['lines'] << make_line(id, child_id)
         end
-
       end
 
       def make_box(node, id)
-        box = @library[:objects][node.name]
+        box = @library[:objects][node.name].dup
         box['id'] = id
-        box['patching_rect'] = [OFFSET_X + node.x_rank * STEP_X, OFFSET_Y + node.y_rank * STEP_Y, box['width'] || WIDTH, box['height'] || HEIGHT]
+        box['patching_rect'] = [OFFSET_X + (node.x_rank - 1) * STEP_X, OFFSET_Y + (node.y_rank - 1) * STEP_Y, box['width'] || WIDTH, box['height'] || HEIGHT]
         unless box['text'].nil?
           box['text'] += " #{node.args}"
         end
@@ -70,8 +71,6 @@ module Maxy
         node
       end
     end
-    #
-    # Box = Struct.new( :id, :node, :x_rank, :y_rank)
 
   end
 end

data/lib/maxy/gen/parser.rb

@@ -6,25 +6,54 @@ module Maxy
 
         @library = Psych.load_file("#{ENV['HOME']}/.maxy-gen/library.yml").freeze
         @tokens = tokens
+        @tree = RootNode.new([])
+        @groups = []
       end
 
-      def parse
-        parse_obj
+      def parse(parent_node=@tree, closing_group=false)
+        if closing_group
+          if peek(:dash) || peek(:identifier) || peek(:escaped_identifier)
+            raise RuntimeError.new("Parsing Error: only + is allowed after a ) closing a group.")
+          end
+        else
+          parse_begin_group parent_node
+          child_node = parse_identifier parent_node
+          parse_dash child_node
+        end
+
+        parse_plus parent_node
+
+        parse_end_group
       end
 
-      def parse_obj(obj_node=nil)
-        return if @tokens.length == 0
+      def parse_begin_group(parent)
+        if peek(:oparen)
+          consume(:oparen)
+          @groups << parent
+        end
+      end
 
-        obj_name = parse_identifier
+      def parse_end_group
+        return @tree if @tokens.empty?
+        if peek(:cparen)
+          consume(:cparen)
+          parse(@groups.pop, true)
+        end
+      end
 
-        arguments = parse_arguments || ''
+      def parse_identifier(parent)
+        if peek(:identifier)
+          obj_name = consume(:identifier).value
+        elsif peek(:escaped_identifier)
+          obj_name = consume(:escaped_identifier).value
+        end
 
-        new_obj_node = ObjectNode.new(obj_name, arguments, [])
-        obj_node.child_nodes << new_obj_node unless obj_node.nil?
+        arguments = parse_arguments || ''
 
-        parse_plus(obj_node)
+        raise RuntimeError.new("Could not find #{obj_name} in object definitions.") if @library[:objects][obj_name].nil?
 
-        parse_dash(new_obj_node)
+        new_obj_node = ObjectNode.new(obj_name, arguments, [])
+        parent.child_nodes << new_obj_node
 
         new_obj_node
       end
@@ -50,41 +79,23 @@ module Maxy
         @tokens.length > 0 && @tokens.fetch(0).type == expected_type
       end
 
-      def parse_identifier
-        if peek(:identifier)
-          obj_name = consume(:identifier).value
-        else
-          if peek(:escaped_identifier)
-            obj_name = consume(:escaped_identifier).value
-          end
-        end
-        raise RuntimeError.new("Could not find #{obj_name} in object definitions.") if @library[:objects][obj_name].nil?
-
-        obj_name
-      end
-
       def parse_plus(obj_node)
         if peek(:plus)
           consume(:plus)
-          sibling_obj_name = parse_identifier
-          sibling_args = parse_arguments || ''
-          sibling_obj_node = ObjectNode.new(sibling_obj_name, sibling_args, [])
-          obj_node.child_nodes << sibling_obj_node
-
-          parse_plus(obj_node)
-
-          parse_dash(sibling_obj_node)
+          parse(obj_node)
         end
       end
 
       def parse_dash(obj_node)
         if peek(:dash)
           consume(:dash)
-          parse_obj(obj_node)
+          parse(obj_node)
         end
       end
     end
 
     ObjectNode = Struct.new(:name, :args, :child_nodes, :x_rank, :y_rank)
+    RootNode = Struct.new(:child_nodes)
+
   end
 end

data/lib/maxy/gen/tokenizer.rb

@@ -3,8 +3,10 @@ module Maxy
     class Tokenizer
       TOKEN_TYPES = [
           [:arguments, /({[^{}]*})/],
-          [:escaped_identifier, /(\\[\S][^-+{}()\\]+)(?=[-+*{}])?/],
+          [:escaped_identifier, /(\\[\S][^-+{}()\\]*)(?=[-+*{}])?/],
           [:identifier, /([^-+{}()\\]+)(?=[-+*{}])?/],
+          [:oparen, /(\()/],
+          [:cparen, /(\))/],
           [:plus, /(\+)/],
           [:dash, /(-)/]
       ]

data/lib/maxy/gen/version.rb

@@ -1,5 +1,5 @@
 module Maxy
   module Gen
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxy-gen
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler