Parse comments and multi-properties. Some bug remains, uncovered by the ff4_ex file.

Author: Trevoke

lib/sgf/node.rb

@@ -30,9 +30,9 @@ def add_children *nodes
     #Takes a hash {identity => property} and adds those to the current node.
     #If a property already exists, it will append to it.
     def add_properties hash
-      hash.each do |key, value|
-        @properties[key] ||= ""
-        @properties[key].concat value
+      hash.each do |identity, property|
+        @properties[identity] ||= property.class.new
+        @properties[identity].concat property
       end
     end
 

lib/sgf/parser.rb

@@ -11,6 +11,9 @@ class Parser
     BRANCHING = ["(", ")"]
     PROPERTY = ["[", "]"]
     NODE_DELIMITERS = [NEW_NODE].concat BRANCHING
+    LIST_IDENTITIES = ["AW", "AB", "AE", "AR", "CR", "DD",
+                       "LB", "LN", "MA", "SL", "SQ", "TR", "VW",
+                       "TB", "TW"]
 
     def initialize strict_parsing = true
       @strict_parsing = strict_parsing
@@ -31,12 +34,16 @@ def parse sgf
       @stream = streamable sgf
       until @stream.eof?
         case next_character
-          when ";" then create_new_node
-          when "(" then open_branch
-          when ")" then close_branch
+          when ";" then
+            create_new_node
+            parse_node_data
+            add_properties_to_current_node
+          when "(" then
+            open_branch
+          when ")" then
+            close_branch
+          else next
         end
-        parse_node_data
-        add_properties_to_current_node
       end
       @tree
     end
@@ -87,18 +94,56 @@ def still_inside_node?
     def parse_identity
       @identity = ""
       while char = next_character and char != "["
-        @identity << char
+        @identity << char unless char == "\n"
       end
     end
 
     def parse_property
       @property = ""
+      case @identity.upcase
+        when "C" then
+          parse_comment
+        when *LIST_IDENTITIES then
+          parse_multi_property
+        else
+          parse_generic_property
+      end
+    end
+
+    def parse_comment
+      while char = next_character and still_inside_comment? char
+        @property << char
+      end
+      @property.gsub! "\\]", "]"
+    end
+
+    def parse_multi_property
+      while char = next_character and still_inside_multi_property? char
+        @property << char
+      end
+      @property = @property.gsub("][", ",").split(",")
+    end
+
+    def parse_generic_property
       while char = next_character and char != "]"
         @property << char
       end
     end
 
+    def still_inside_comment? char
+      char != "]" || (char == "]" && @property[-1..-1] == "\\")
+    end
+
+    def still_inside_multi_property? char
+      return true if char != "]"
+      char = next_character
+      @stream.pos -= 1
+      return true if char == "["
+      false
+    end
+
     def add_properties_to_current_node
+      p @node_properties
       @current_node.add_properties @node_properties
     end
 

spec/parser_spec.rb

@@ -53,14 +53,24 @@
     node.children[1].c.should == "branch"
   end
 
-  it "should parse a tricky comment well" do
+  it "should parse a comment with a ] inside" do
     parser = strict_parser
-    tree = parser.parse "(;C[Oh hi] there\\]"
+    tree = parser.parse "(;C[Oh hi\\] there]"
     tree.root.children[0].c.should == "Oh hi] there"
   end
 
   it "should parse a multi-property identity well" do
-    pending "code me!"
+    parser = strict_parser
+    tree = parser.parse "(;FF[4];AW[bd][cc][qr])"
+    tree.root.children[0].children[0].aw.should == ["bd", "cc", "qr"]
+  end
+
+  it "should parse multiple trees" do
+    parser = strict_parser
+    tree = parser.parse "(;FF[4];AW[dd][cc])(;FF[4];PB[ad])"
+    tree.root.children.size.should == 2
+    tree.root.children[0].children[0].aw.should == ["dd", "cc"]
+    tree.root.children[1].children[0].pb.should == "ad"
   end
 
   private

spec/spec_helper.rb

@@ -12,6 +12,5 @@ def get_first_game_from file
 
 def get_tree_from file
   parser = SGF::Parser.new
-  p File.read file
   parser.parse File.read(file)
 end

spec/tree_spec.rb

@@ -11,6 +11,26 @@
     FileUtils.rm_f 'spec/data/ff4_ex_saved.sgf'
   end
 
+  it "should have two gametrees" do
+    @tree.games.size.should == 2
+  end
+
+  it "should tell you the id of the object on inspect" do
+    @tree.inspect.should match /#{@tree.object_id}/
+  end
+
+  it "should tell you the class of the object on inspect" do
+    @tree.inspect.should match /SGF::Tree/
+  end
+
+  it "should tell you how many games it has on inspect" do
+    @tree.inspect.should match /Games: 2/
+  end
+
+  it "should tell you how many nodes it has on inspect" do
+    @tree.inspect.should match /Nodes: 62/
+  end
+
   it "should use preorder traversal for each" do
     @tree = get_tree_from 'spec/data/example1.sgf'
     array = []
@@ -42,24 +62,4 @@
     tree2.should == @tree
   end
 
-  it "should have two gametrees" do
-    @tree.games.size.should == 2
-  end
-
-  it "should tell you the id of the object on inspect" do
-    @tree.inspect.should match /#{@tree.object_id}/
-  end
-
-  it "should tell you the class of the object on inspect" do
-    @tree.inspect.should match /SGF::Tree/
-  end
-
-  it "should tell you how many games it has on inspect" do
-    @tree.inspect.should match /Games: 2/
-  end
-
-  it "should tell you how many nodes it has on inspect" do
-    @tree.inspect.should match /Nodes: 62/
-  end
-
 end