rtext 0.5.1 → 0.7.0

data/test/context_builder_test.rb

@@ -108,7 +108,7 @@ def test_root_after_unlabled
   c = build_context TestMM, <<-END
 TestNode "bla"| 
   END
-  assert_context c, :prefix => "bla", :feature => "unlabled", :in_array => false, :in_block => false
+  assert_context c, :prefix => "\"bla\"", :feature => "unlabled", :in_array => false, :in_block => false
   assert(c.element.is_a?(TestMM::TestNode))
   assert_nil(c.element.unlabled)
 end
@@ -117,7 +117,7 @@ def test_root_after_unlabled_string_with_comma
   c = build_context TestMM, <<-END
 TestNode "a,b"| 
   END
-  assert_context c, :prefix => "a,b", :feature => "unlabled", :in_array => false, :in_block => false
+  assert_context c, :prefix => "\"a,b\"", :feature => "unlabled", :in_array => false, :in_block => false
   assert(c.element.is_a?(TestMM::TestNode))
   assert_nil(c.element.unlabled)
 end
@@ -126,7 +126,7 @@ def test_root_after_unlabled_string_with_quoted_quote
   c = build_context TestMM, <<-END
 TestNode "a,\\"b"| 
   END
-  assert_context c, :prefix => "a,\"b", :feature => "unlabled", :in_array => false, :in_block => false
+  assert_context c, :prefix => "\"a,\\\"b\"", :feature => "unlabled", :in_array => false, :in_block => false
   assert(c.element.is_a?(TestMM::TestNode))
   assert_nil(c.element.unlabled)
 end
@@ -218,7 +218,7 @@ def test_root_unlabled_array_first_value_quoted
   c = build_context TestMM, <<-END
 TestNode "bla", ["a"|
   END
-  assert_context c, :prefix => "a", :feature => "unlabled_array", :in_array => true, :in_block => false
+  assert_context c, :prefix => "\"a\"", :feature => "unlabled_array", :in_array => true, :in_block => false
   assert(c.element.is_a?(TestMM::TestNode))
   assert_equal("bla", c.element.unlabled)
   assert_equal([], c.element.unlabled_array)
@@ -270,7 +270,7 @@ def test_root_unlabled_array_second_value_quoted
   c = build_context TestMM, <<-END
 TestNode "bla", ["a", "b"|
   END
-  assert_context c, :prefix => "b", :feature => "unlabled_array", :in_array => true, :in_block => false
+  assert_context c, :prefix => "\"b\"", :feature => "unlabled_array", :in_array => true, :in_block => false
   assert(c.element.is_a?(TestMM::TestNode))
   assert_equal("bla", c.element.unlabled)
   assert_equal(["a"], c.element.unlabled_array)
@@ -330,7 +330,7 @@ def test_root_labled_string_value
   c = build_context TestMM, <<-END
 TestNode text: "a,b"| 
   END
-  assert_context c, :prefix => "a,b", :feature => "text", :in_array => false, :in_block => false, :after_label => true
+  assert_context c, :prefix => "\"a,b\"", :feature => "text", :in_array => false, :in_block => false, :after_label => true
   assert(c.element.is_a?(TestMM::TestNode))
   assert_nil(c.element.text)
 end
@@ -643,7 +643,7 @@ def test_in_cmd_in_array_after_second_string_value
     TestNode nums: 3 {
       TestNode strings: ["a,b", "c,d"|
   END
-  assert_context c, :prefix => "c,d", :feature => "strings", :in_array => true, :in_block => false, :after_label => true
+  assert_context c, :prefix => "\"c,d\"", :feature => "strings", :in_array => true, :in_block => false, :after_label => true
   assert_simple_model(c.element)
   assert_equal(["a,b"], c.element.strings)
 end

data/test/instantiator_test.rb

@@ -2,6 +2,7 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
+require 'bigdecimal'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 require 'rtext/instantiator'
@@ -42,12 +43,13 @@ class InstantiatorTest < Test::Unit::TestCase
     TestNode.contains_one 'singleChild2b', TestNode2, 'parentB'
   end
 
-  module TestMMLinenoFilename
+  module TestMMLinenoFilenameFragment
     extend RGen::MetamodelBuilder::ModuleExtension
     class TestNode < RGen::MetamodelBuilder::MMBase
       has_attr 'text', String
       has_attr 'lineno', Integer
       has_attr 'filename', String
+      has_attr 'fragmentr', String
       contains_many 'childs', TestNode, 'parent'
     end
   end
@@ -174,7 +176,7 @@ class InstantiatorTest < Test::Unit::TestCase
         TestNode text: "node3"
       }
       TestNode text: "node4"
-    ), TestMMLinenoFilename, :line_number_attribute => "lineno")
+    ), TestMMLinenoFilenameFragment, :line_number_attribute => "lineno")
     assert_no_problems(problems)
     assert_equal 2, env.find(:text => "node1").first.lineno
     assert_equal 3, env.find(:text => "node2").first.lineno
@@ -182,6 +184,14 @@ class InstantiatorTest < Test::Unit::TestCase
     assert_equal 8, env.find(:text => "node4").first.lineno
   end
 
+  def test_missing_line_number_setter
+    env, problems = instantiate(%Q(
+      TestNode text: A
+    ), TestMMLinenoFilenameFragment, :line_number_attribute => "wrong_attribute_name")
+    assert_no_problems(problems)
+    assert_nil env.elements.first.lineno
+  end
+
   def test_root_elements
     root_elements = []
     env, problems = instantiate(%Q(
@@ -205,10 +215,33 @@ class InstantiatorTest < Test::Unit::TestCase
   def test_file_name_setter
     env, problems = instantiate(%Q(
       TestNode text: A
-    ), TestMMLinenoFilename, :file_name => "some_file", :file_name_attribute => "filename")
+    ), TestMMLinenoFilenameFragment, :file_name => "some_file", :file_name_attribute => "filename")
     assert_equal "some_file", env.elements.first.filename 
   end
 
+  def test_missing_file_name_setter
+    env, problems = instantiate(%Q(
+      TestNode text: A
+    ), TestMMLinenoFilenameFragment, :file_name => "some_file", :file_name_attribute => "wrong_attribute_name")
+    assert_nil env.elements.first.filename 
+  end
+
+  def test_fragment_ref_setter
+    the_ref = "is a string here but would normally be an RGen fragment"
+    env, problems = instantiate(%Q(
+      TestNode text: A
+    ), TestMMLinenoFilenameFragment, :fragment_ref => the_ref, :fragment_ref_attribute => "fragmentr")
+    assert_equal the_ref.object_id, env.elements.first.fragmentr.object_id
+  end
+
+  def test_missing_fragment_ref_setter
+    the_ref = "is a string here but would normally be an RGen fragment"
+    env, problems = instantiate(%Q(
+      TestNode text: A
+    ), TestMMLinenoFilenameFragment, :fragment_ref => the_ref, :fragment_ref_attribute => "wrong_attribute_name")
+    assert_nil env.elements.first.fragmentr
+  end
+
   #
   # children with role
   #
@@ -375,6 +408,7 @@ class InstantiatorTest < Test::Unit::TestCase
     ]
     assert_equal ref_targets, env.find(:text => "root").first.childs.collect{|c| c.related.targetIdentifier}
     assert_equal ref_targets, unresolved_refs.collect{|ur| ur.proxy.targetIdentifier}
+    assert unresolved_refs.all?{|ur| ur.feature_name == "related"}
   end
 
   def test_references_many
@@ -502,28 +536,28 @@ class InstantiatorTest < Test::Unit::TestCase
     env, problems = instantiate(%Q(
       TestNode text: "some text" {
     ), TestMM)
-    assert_problems([/unexpected end of file, expected \}/i], problems)
+    assert_problems([[/unexpected end of file, expected \}/i, 2]], problems)
   end
 
   def test_unknown_command
     env, problems = instantiate(%Q(
       NotDefined 
     ), TestMM)
-    assert_problems([/unknown command 'NotDefined'/i], problems)
+    assert_problems([[/unknown command 'NotDefined'/i, 2]], problems)
   end
 
   def test_unknown_command_abstract
     env, problems = instantiate(%Q(
       TestNode
     ), TestMMAbstract)
-    assert_problems([/unknown command 'TestNode'/i], problems)
+    assert_problems([[/unknown command 'TestNode'/i, 2]], problems)
   end
 
   def test_unexpected_unlabled_argument
     env, problems = instantiate(%Q(
       TestNode "more text"
     ), TestMM)
-    assert_problems([/unexpected unlabled argument, 0 unlabled arguments expected/i], problems)
+    assert_problems([[/unexpected unlabled argument, 0 unlabled arguments expected/i, 2]], problems)
   end
 
   def test_unknown_child_role
@@ -533,7 +567,7 @@ class InstantiatorTest < Test::Unit::TestCase
           TestNode
       }
     ), TestMM)
-    assert_problems([/unknown child role 'notdefined'/i], problems)
+    assert_problems([[/unknown child role 'notdefined'/i, 3]], problems)
   end
 
   def test_not_a_child_role
@@ -546,8 +580,8 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM)
     assert_problems([
-      /role 'text' can not take child elements/i,
-      /role 'others' can not take child elements/i
+      [/role 'text' can not take child elements/i, 3],
+      [/role 'others' can not take child elements/i, 5]
     ], problems)
   end
 
@@ -561,7 +595,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /only one child allowed in role 'singleChild'/i,
+      [/only one child allowed in role 'singleChild'/i, 5]
     ], problems)
   end
 
@@ -570,12 +604,14 @@ class InstantiatorTest < Test::Unit::TestCase
       TestNode {
         singleChild:
           TestNode
+        singleChild: [
+        ]
         singleChild:
           TestNode
       }
     ), TestMM2)
     assert_problems([
-      /only one child allowed in role 'singleChild'/i,
+      [/only one child allowed in role 'singleChild'/i, 8]
     ], problems)
   end
 
@@ -587,7 +623,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /role 'singleChild' can not take a TestNode2, expected TestNode/i,
+      [/role 'singleChild' can not take a TestNode2, expected TestNode/i, 4]
     ], problems)
   end
 
@@ -598,7 +634,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /unexpected \}, expected identifier/i
+      [/unexpected \}, expected identifier/i, 4]
     ], problems)
   end
 
@@ -609,7 +645,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /command 'TestNode3' can not be used in this context/i,
+      [/command 'TestNode3' can not be used in this context/i, 3]
     ], problems)
   end
 
@@ -620,7 +656,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /role of element is ambiguous, use a role label/i,
+      [/role of element is ambiguous, use a role label/i, 3]
     ], problems)
   end
 
@@ -641,7 +677,7 @@ class InstantiatorTest < Test::Unit::TestCase
       }
     ), TestMM2)
     assert_problems([
-      /only one child allowed in role 'singleChild'/i,
+      [/only one child allowed in role 'singleChild'/i, 4]
     ], problems)
   end
 
@@ -649,35 +685,35 @@ class InstantiatorTest < Test::Unit::TestCase
     env, problems = instantiate(%Q(
       TestNode unknown: "some text"
     ), TestMM)
-    assert_problems([/unknown argument 'unknown'/i], problems)
+    assert_problems([[/unknown argument 'unknown'/i, 2]], problems)
   end
 
   def test_attribute_in_child_reference
     env, problems = instantiate(%Q(
       TestNode singleChild: "some text"
     ), TestMM2)
-    assert_problems([/argument 'singleChild' can only take child elements/i], problems)
+    assert_problems([[/argument 'singleChild' can only take child elements/i, 2]], problems)
   end
 
   def test_arguments_duplicate
     env, problems = instantiate(%Q(
       TestNode text: "some text", text: "more text"
     ), TestMM)
-    assert_problems([/argument 'text' already defined/i], problems)
+    assert_problems([[/argument 'text' already defined/i, 2]], problems)
   end
 
   def test_unlabled_arguments_duplicate
     env, problems = instantiate(%Q(
       TestNode text: "some text", "more text"
     ), TestMM, :unlabled_arguments => proc {|c| ["text"]})
-    assert_problems([/argument 'text' already defined/i], problems)
+    assert_problems([[/argument 'text' already defined/i, 2]], problems)
   end
 
   def test_multiple_arguments_in_non_many_attribute
     env, problems = instantiate(%Q(
       TestNode text: ["text1", "text2"]
     ), TestMM)
-    assert_problems([/argument 'text' can take only one value/i], problems)
+    assert_problems([[/argument 'text' can take only one value/i, 2]], problems)
   end
 
   def test_wrong_argument_type
@@ -693,15 +729,15 @@ class InstantiatorTest < Test::Unit::TestCase
       TestNode related: 1
     ), TestMM)
     assert_problems([
-      /argument 'text' can not take a integer, expected string/i,
-      /argument 'integer' can not take a string, expected integer/i,
-      /argument 'integer' can not take a boolean, expected integer/i,
-      /argument 'integer' can not take a float, expected integer/i,
-      /argument 'integer' can not take a identifier, expected integer/i,
-      /argument 'integer' can not take a reference, expected integer/i,
-      /argument 'enum' can not take a integer, expected identifier/i,
-      /argument 'enum' can not take value x, expected A, B/i,
-      /argument 'related' can not take a integer, expected reference, identifier/i
+      [/argument 'text' can not take a integer, expected string/i, 2],
+      [/argument 'integer' can not take a string, expected integer/i, 3],
+      [/argument 'integer' can not take a boolean, expected integer/i, 4],
+      [/argument 'integer' can not take a float, expected integer/i, 5],
+      [/argument 'integer' can not take a identifier, expected integer/i, 6],
+      [/argument 'integer' can not take a reference, expected integer/i, 7],
+      [/argument 'enum' can not take a integer, expected identifier/i, 8],
+      [/argument 'enum' can not take value x, expected A, B/i, 9],
+      [/argument 'related' can not take a integer, expected reference, identifier/i, 10]
     ], problems)
   end
 
@@ -710,14 +746,14 @@ class InstantiatorTest < Test::Unit::TestCase
       TestNode 
       }
     ), TestMM)
-    assert_problems([/unexpected \}, expected identifier/i], problems)
+    assert_problems([[/unexpected \}, expected identifier/i, 3]], problems)
   end
 
   def test_invalid_root
     env, problems = instantiate(%Q(
       NonRootClass
     ), TestMMNonRootClass)
-    assert_problems([/command 'NonRootClass' can not be used on root level/i], problems)
+    assert_problems([[/command 'NonRootClass' can not be used on root level/i, 2]], problems)
   end
 
   #
@@ -763,7 +799,7 @@ class InstantiatorTest < Test::Unit::TestCase
     assert_equal [1], root_elements[0].nums
     assert_equal "bla", root_elements[0].text
     assert_problems([
-      /unexpected label .*, expected ,/i,
+      [/unexpected label .*, expected ,/i, 2],
     ], problems)
   end
 
@@ -775,8 +811,8 @@ class InstantiatorTest < Test::Unit::TestCase
     assert_equal 1, root_elements.size
     assert_equal [1], root_elements[0].nums
     assert_problems([
-      /unexpected string 'bla', expected ,/i,
-      /unexpected unlabled argument/i
+      [/unexpected string 'bla', expected ,/i, 2],
+      [/unexpected unlabled argument/i, 2]
     ], problems)
   end
 
@@ -917,12 +953,12 @@ class InstantiatorTest < Test::Unit::TestCase
     assert_equal [1], root_elements[0].nums
     assert_equal "bla", root_elements[1].text
     assert_equal [1], root_elements[1].nums
+    assert_equal "bla", root_elements[2].text
     assert_equal [1, 3], root_elements[3].nums
     assert_problems([
       [/parse error on token '\*'/i, 2],
       [/parse error on token '\*'/i, 3],
-      [/parse error on token '\?text:'/i, 4],
-      [/unexpected unlabled argument/i, 4],
+      [/parse error on token '\?'/i, 4],
       [/parse error on token '\*'/i, 5],
     ], problems)
   end
@@ -975,7 +1011,7 @@ class InstantiatorTest < Test::Unit::TestCase
     ], problems)
   end
 
-  def test_unclosed_bracket
+  def test_unclosed_child_bracket
     root_elements = []
     env, problems = instantiate(%Q(
       TestNode { 
@@ -1195,7 +1231,7 @@ class InstantiatorTest < Test::Unit::TestCase
     ), TestMM, :comment_handler => proc {|c,k,e,env|
       false
     })
-    assert_problems([/element can not take this comment/], problems)
+    assert_problems([[/element can not take this comment/, 3]], problems)
   end
 
   def test_comment_handler_comment_not_allowed_unassociated
@@ -1204,7 +1240,7 @@ class InstantiatorTest < Test::Unit::TestCase
     ), TestMM, :comment_handler => proc {|c,k,e,env|
       false
     })
-    assert_problems([/Unassociated comment not allowed/], problems)
+    assert_problems([[/Unassociated comment not allowed/, 2]], problems)
   end
 
   #
@@ -1216,7 +1252,7 @@ class InstantiatorTest < Test::Unit::TestCase
       @annotation 
       TestNode
       ), TestMM)
-    assert_problems([/annotation not allowed/i], problems)
+    assert_problems([[/annotation not allowed/i, 3]], problems)
   end
 
   def test_annotation_not_allowed
@@ -1226,7 +1262,7 @@ class InstantiatorTest < Test::Unit::TestCase
       ), TestMM, :annotation_handler => proc {|a,e,env|
         false
       })
-    assert_problems([/annotation not allowed/i], problems)
+    assert_problems([[/annotation not allowed/i, 3]], problems)
   end
 
   def test_annotation_in_wrong_places
@@ -1308,16 +1344,20 @@ class InstantiatorTest < Test::Unit::TestCase
       TestNode text: <%a%>b%>
       ), TestMM, :enable_generics => true)
     assert_problems([
-      [/parse error on token '<bla'/i, 2],
+      [/parse error on token '<'/i, 2],
+      [/unexpected unlabled argument/i, 2],
       [/parse error on token '>'/i, 3],
       [/unexpected identifier 'b'/i, 5],
       [/parse error on token '>'/i, 5],
       [/unexpected unlabled argument/i, 5],
-      [/parse error on token '<%a'/i, 6],
-      [/parse error on token '<%a%'/i, 7],
+      [/parse error on token '<'/i, 6],
+      [/unexpected unlabled argument/i, 6],
+      [/parse error on token '<'/i, 7],
+      [/unexpected unlabled argument/i, 7],
+      [/parse error on token '%'/i, 7],
       [/unexpected identifier 'b'/i, 8],
       [/unexpected unlabled argument/i, 8],
-      [/parse error on token '%>'/i, 8],
+      [/parse error on token '%'/i, 8],
     ], problems)
   end
 
@@ -1413,11 +1453,19 @@ class InstantiatorTest < Test::Unit::TestCase
       TestNode float: 1.23 
       TestNode float: 1.23e-08 
       TestNode float: 1.23e+10 
+      TestNode float: 1234567890.123456789
     ), TestMM)
     assert_no_problems(problems)
     assert_equal 1.23, env.elements[0].float
     assert_equal 1.23e-08, env.elements[1].float
     assert_equal 1.23e+10, env.elements[2].float
+    if rgen_with_bigdecimal?
+      assert env.elements[3].float.is_a?(BigDecimal)
+      assert_equal "1234567890.123456789", env.elements[3].float.to_s("F")
+    else
+      assert env.elements[3].float.is_a?(Float)
+      assert_equal "1234567890.1234567", env.elements[3].float.to_s
+    end
   end
 
   def test_boolean
@@ -1444,6 +1492,17 @@ class InstantiatorTest < Test::Unit::TestCase
     assert_equal [:A, :B, :'non-word*chars', :'2you'], env.find(:text => "root").first.childs.collect{|c| c.enum}
   end
 
+  def test_with_bom
+    env, problems = instantiate(%Q(\xEF\xBB\xBF
+      TestNode text: "some text", nums: [1,2] {
+        TestNode text: "child"
+        TestNode text: "child2"
+      }
+      ), TestMM)
+    assert_no_problems(problems)
+    assert_model_simple(env, :with_nums)
+  end
+
   #
   # conflicts with builtins
   # 
@@ -1475,7 +1534,7 @@ class InstantiatorTest < Test::Unit::TestCase
     input.force_encoding("binary")
     env, problems = instantiate(input, TestMM)
     assert_no_problems(problems)
-    assert_match env.elements.first.text, /AE Umlaut: /
+    assert_match /AE Umlaut: /, env.elements.first.text
   end
 
   private
@@ -1527,6 +1586,15 @@ class InstantiatorTest < Test::Unit::TestCase
     end
   end
 
+  def rgen_with_bigdecimal?
+    begin
+      TestMM::TestNode.new.float = BigDecimal.new("0.0")
+    rescue StandardError
+      return false
+    end
+    true
+  end
+
 end