kwartz 3.0.0 → 3.1.0

data/test/test-parser.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 117 $
-### $Release: 3.0.0 $
+### $Rev: 122 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -11,7 +11,7 @@ class ParserTest < Test::Unit::TestCase
 
   ## define test methods
   filename = __FILE__.sub(/\.rb$/, '.yaml')
-  load_yaml_testdata(filename)
+  load_yaml_testdata(filename, :lang=>'ruby')
 
   def _test
     begin
@@ -23,29 +23,27 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def __test
-    case @parser
-    when 'RubyStyleParser'
+    case @style
+    when 'ruby'
       parser = Kwartz::RubyStyleParser.new()
-    when 'CssStyleParser'
+    when 'css'
       parser = Kwartz::CssStyleParser.new()
     else
-      raise "*** invalid parser class: #{@parser}"
+      raise "*** invalid parser style: #{@style}"
     end
     if @name =~ /scan/
       actual = ''
-      parser.__send__ :reset, @input
+      parser.__send__ :reset, @plogic
       while (ret = parser.scan()) != nil
         actual << "#{parser.linenum}:#{parser.column}:"
         actual << " token=#{parser.token.inspect}, value=#{parser.value.inspect}\n"
         break if ret == :error
       end
     else
-      rulesets = parser.parse(@input)
+      rulesets = parser.parse(@plogic)
       actual = ''
       rulesets.each do |ruleset|
-        s = ruleset._inspect(1)
-        s[0] = '-'
-        actual << s
+        actual << ruleset._inspect()
       end if rulesets
     end
     assert_text_equal(@expected, actual)

data/test/test-parser.yaml

@@ -1,394 +1,552 @@
----
+## $Rev: 132 $
+## $Release: 3.1.0 $
+## copyright(c) 2004-2006 kuwata-lab.com all rights reserved
+
+###
 - name:  scanner1_css
-  parser: CssStyleParser
-  input: |
-    /* comment */
-    #list {
-      value
-      attrs
-      append
-      logic {
-      }
-    }
-  expected: |
-    2:2: token=35, value="#"
-    2:6: token=:ident, value="list"
-    2:8: token=:"{", value="{"
-    3:8: token=:value, value="value"
-    4:8: token=:attrs, value="attrs"
-    5:9: token=:append, value="append"
-    6:8: token=:logic, value="logic"
-    6:10: token=:"{", value="{"
-    7:4: token=:"}", value="}"
-    8:2: token=:"}", value="}"
+  style: css
+  plogic: |
+	/* comment */
+	#list {
+	  value
+	  attrs
+	  append
+	  logic {
+	  }
+	}
+  expected*:
+    ruby: |
+	2:2: token=35, value="#"
+	2:6: token=:ident, value="list"
+	2:8: token=:"{", value="{"
+	3:8: token=:value, value="value"
+	4:8: token=:attrs, value="attrs"
+	5:9: token=:append, value="append"
+	6:8: token=:logic, value="logic"
+	6:10: token=:"{", value="{"
+	7:4: token=:"}", value="}"
+	8:2: token=:"}", value="}"
+    php: |
+	2:2: token=#, value="#"
+	2:6: token=:ident, value="list"
+	2:8: token={, value="{"
+	3:8: token=value, value="value"
+	4:8: token=attrs, value="attrs"
+	5:9: token=append, value="append"
+	6:8: token=logic, value="logic"
+	6:10: token={, value="{"
+	7:4: token=}, value="}"
+	8:2: token=}, value="}"
 
 - name:  scanner1_ruby
-  parser: RubyStyleParser
-  input: |
-    # comment
-    element "list" {
-      value
-      attrs
-      append
-      logic {
-      }
-    }
+  style: ruby
+  plogic: |
+	# comment
+	element "list" {
+	  value
+	  attrs
+	  append
+	  logic {
+	  }
+	}
   expected: |
-    2:8: token=:element, value="element"
-    2:15: token=:string, value="list"
-    2:17: token=:"{", value="{"
-    3:8: token=:value, value="value"
-    4:8: token=:attrs, value="attrs"
-    5:9: token=:append, value="append"
-    6:8: token=:logic, value="logic"
-    6:10: token=:"{", value="{"
-    7:4: token=:"}", value="}"
-    8:2: token=:"}", value="}"
+	2:8: token=:element, value="element"
+	2:15: token=:string, value="list"
+	2:17: token=:"{", value="{"
+	3:8: token=:value, value="value"
+	4:8: token=:attrs, value="attrs"
+	5:9: token=:append, value="append"
+	6:8: token=:logic, value="logic"
+	6:10: token=:"{", value="{"
+	7:4: token=:"}", value="}"
+	8:2: token=:"}", value="}"
 
----
+###
 - name:  parse_elem1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-    }
+  style: css
+  plogic: |
+	#list {
+	}
   expected: &elem1|
-    - name: "list"
+	- name: list
 
 - name:  parse_elem1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	}
   expected: *elem1
 
----
+###
 - name:  parse_value_part1_css
-  parser: CssStyleParser
+  style: css
   desc:  value part
-  input: |
-    #list {
-      value:  @user['name'];
-    }
+  plogic: |
+	#list {
+	  value:  @user['name'];
+	}
   expected: &value1|
-    - name: "list"
-      cont: "@user['name']"
+	- name: list
+	  cont: @user['name']
 
 - name:  parse_value_part1_ruby
-  parser: RubyStyleParser
+  style: ruby
   desc:  value part
-  input: |
-    element "list" {
-      value @user['name']
-    }
+  plogic: |
+	element "list" {
+	  value @user['name']
+	}
   expected: *value1
 
----
+###
 - name:  parse_attrs_part1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      attrs:  "class" @class,
-              'color' @prop[:color];
-    }
+  style: css
+  plogic: |
+	#list {
+	  attrs:  "class" @class,
+	          'color' @prop[:color];
+	}
   expected: &attrs1|
-    - name: "list"
-      attrs:
-        - name:  "class"
-          value: "@class"
-        - name:  "color"
-          value: "@prop[:color]"
+	- name: list
+	  attrs:
+	    - name:  class
+	      value: @class
+	    - name:  color
+	      value: @prop[:color]
 
 - name:  parse_attrs_part1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      attrs  "class"=>@class, 'color' => @prop[:color]
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	  attrs  "class"=>@class, 'color' => @prop[:color]
+	}
   expected: *attrs1
 
----
+###
 - name:  parse_append_part1_css
-  parser: CssStyleParser
-  input: |
-    #list1 {
-      append:  @name==item['name'] ? " checked='checked'" : '',
-               chk(@name);
-    }
-    #list2 {
-      append:  aaa, bbb,ccc;
-    }
+  style: css
+  plogic: |
+	#list1 {
+	  append:  @name==item['name'] ? " checked='checked'" : '',
+	           chk(@name);
+	}
+	#list2 {
+	  append:  aaa, bbb,ccc;
+	}
   expected: &append1|
-    - name: "list1"
-      append:
-        - "@name==item['name'] ? \" checked='checked'\" : ''"
-        - "chk(@name)"
-    - name: "list2"
-      append:
-        - "aaa, bbb,ccc"
+	- name: list1
+	  append:
+	    - @name==item['name'] ? " checked='checked'" : ''
+	    - chk(@name)
+	- name: list2
+	  append:
+	    - aaa, bbb,ccc
 
 - name:  parse_append_part1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list1" {
-      append  @name==item['name'] ? " checked='checked'" : '', chk(@name)
-    }
-    element "list2" {
-      append aaa, bbb,ccc
-    }
+  style: ruby
+  plogic: |
+	element "list1" {
+	  append  @name==item['name'] ? " checked='checked'" : '', chk(@name)
+	}
+	element "list2" {
+	  append aaa, bbb,ccc
+	}
   expected: |
-    - name: "list1"
-      append:
-        - "@name==item['name'] ? \" checked='checked'\" : ''"
-        - "chk(@name)"
-    - name: "list2"
-      append:
-        - "aaa"
-	- "bbb,ccc"
+	- name: list1
+	  append:
+	    - @name==item['name'] ? " checked='checked'" : ''
+	    - chk(@name)
+	- name: list2
+	  append:
+	    - aaa
+	    - bbb,ccc
 
----
+###
 - name:  parse_remove_part1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      remove: "foo", "bar", 'baz';
-    }
+  style: css
+  plogic: |
+	#list {
+	  remove: "foo", "bar", 'baz';
+	}
   expected: &remove1|
-    - name: "list"
-      remove:
-        - "foo"
-        - "bar"
-        - "baz"
+	- name: list
+	  remove:
+	    - foo
+	    - bar
+	    - baz
 
 - name:  parse_remove_part1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      remove "foo", "bar", 'baz'
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	  remove "foo", "bar", 'baz'
+	}
   expected: *remove1
 
----
+###
 - name:  parse_tagname_part1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      tagname:   'html:html';
-    }
+  style: css
+  plogic: |
+	#list {
+	  tagname:   'html:html';
+	}
   expected: &tagname1|
-    - name: "list"
-      tagname: "html:html"
+	- name: list
+	  tagname: html:html
 
 - name:  parse_tagname_part1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      tagname   'html:html'
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	  tagname   'html:html'
+	}
   expected: *tagname1
 
----
+###
 - name:  parse_logic_part1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      logic: {
-        @list.each { |item|
-          _stag
-          _cont
-          _etag
-        }
-      }
-    }
+  style: css
+  plogic: |
+	#list {
+	  logic: {
+	    @list.each { |item|
+	      _stag
+	      _cont
+	      _etag
+	    }
+	  }
+	}
   expected: &logic1|
-    - name: "list"
-      logic:
-        - "    @list.each { |item|"
-        - _stag
-        - _cont
-        - _etag
-        - "    }"
+	- name: list
+	  logic:
+	    - <%    @list.each { |item|%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%    }%>
 
 - name:  parse_logic_part1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      logic {
-        @list.each { |item|
-          _stag
-          _cont
-          _etag
-        }
-      }
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	  logic {
+	    @list.each { |item|
+	      _stag
+	      _cont
+	      _etag
+	    }
+	  }
+	}
   expected: *logic1
 
----
+###
 - name:  parse_logic_part2_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      logic: {
-        @list.each_with_index { |item, i|
-          if i % 2 == 0
-            _element("foo")
-          else
-            _content('foo')
-          end
-        }
-      }
-    }
+  style: css
+  plogic: |
+	#list {
+	  logic: {
+	    @list.each_with_index { |item, i|
+	      if i % 2 == 0
+	        _element("foo")
+	      else
+	        _content('foo')
+	      end
+	    }
+	  }
+	}
   expected: &logic2|
-    - name: "list"
-      logic:
-        - "    @list.each_with_index { |item, i|"
-        - "      if i % 2 == 0"
-        - _element("foo")
-        - "      else"
-        - _content("foo")
-        - "      end"
-        - "    }"
+	- name: list
+	  logic:
+	    - <%    @list.each_with_index { |item, i|%>
+	    - <%      if i % 2 == 0%>
+	    - _element(foo)
+	    - <%      else%>
+	    - _content(foo)
+	    - <%      end%>
+	    - <%    }%>
 
 - name:  parse_logic_part2_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      logic {
-        @list.each_with_index { |item, i|
-          if i % 2 == 0
-            _element("foo")
-          else
-            _content('foo')
-          end
-        }
-      }
-    }
+  style: ruby
+  plogic: |
+	element "list" {
+	  logic {
+	    @list.each_with_index { |item, i|
+	      if i % 2 == 0
+	        _element("foo")
+	      else
+	        _content('foo')
+	      end
+	    }
+	  }
+	}
   expected: *logic2
 
----
+###
 - name:   parse_import_command1_css
-  parser: CssStyleParser
-  input: |
-      @import 'common.plogic';
-      #item {
-        value: item;
-      }
+  style: css
+  plogic: |
+	@import 'common.plogic';
+	#item {
+	  value: item;
+	}
   expected: |
-      - name: "page_link"
-        cont: "page.label"
-	attrs:
-	  - name:  "href"
-	    value: "page.url"
-	logic:
-	  - "    if page"
-	  - _elem
-	  - "    end"
-      - name: "item"
-        cont: "item"
-  setup: |
-      common_plogic = <<END
-      #page_link {
-        value: page.label;
-	attrs: 'href' page.url;
-        logic: {
-	  if page
-	    _elem
-	  end
+	- name: page_link
+	  cont: page.label
+	  attrs:
+	    - name:  href
+	      value: page.url
+	  logic:
+	    - <%    if page%>
+	    - _elem
+	    - <%    end%>
+	- name: item
+	  cont: item
+  setup*:
+    ruby: |
+	common_plogic = <<END
+	#page_link {
+	  value: page.label;
+	  attrs: 'href' page.url;
+	  logic: {
+	    if page
+	      _elem
+	    end
+	  }
 	}
-      }
-      END
-      File.open('common.plogic', 'w') { |f| f.write(common_plogic) }
-  teardown: |
-      filename = 'common.plogic'
-      File.unlink filename if test(?f, filename)
+	END
+	File.open('common.plogic', 'w') { |f| f.write(common_plogic) }
+    php: |
+	$common_plogic =
+	'#page_link {
+	  value: page.label;
+	  attrs: \'href\' page.url;
+	  logic: {
+	    if page
+	      _elem
+	    end
+	  }
+	}
+	';
+	file_put_contents('common.plogic', $common_plogic);
+  teardown*:
+    ruby: |
+	filename = 'common.plogic'
+	File.unlink filename if test(?f, filename)
+    php: |
+	$filename = 'common.plogic';
+	if (file_exists($filename)) unlink($filename);
+
+###
+- name:   parse_multi_selector_css
+  style: css
+  plogic: |
+	#item1, #item2, #item3 {
+	  value:  $item;
+	    logic: {
+	      foreach ($list as $item) {
+	        _stag();
+	        _cont();
+	        _etag();
+	      }
+	    }
+	}
+  expected: |
+	- name: item1
+	  cont: $item
+	  logic:
+	    - <%      foreach ($list as $item) {%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%      }%>
+	- name: item2
+	  cont: $item
+	  logic:
+	    - <%      foreach ($list as $item) {%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%      }%>
+	- name: item3
+	  cont: $item
+	  logic:
+	    - <%      foreach ($list as $item) {%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%      }%>
 
----
+###
 - name:  parse_document
-  parser: CssStyleParser
-  input: |
-      #DOCUMENT {
-        local:  i, item, title, list;
-	global: _context;
-        begin: {
-	  title = _context[:title]
-	  list = _context[:list]
+  style: css
+  plogic: |
+	#DOCUMENT {
+	  local:  i, item, title, list;
+	  global: _context;
+	  begin: {
+	    title = _context[:title]
+	    list = _context[:list]
+	  }
+	  end: {
+	    print "*** debug:\n"
+	    _context.each do |key, value|
+	       print "*** key=#{key}, value=#{value.inspect}"
+	    end
+	  }
 	}
-	end: {
-	  print "*** debug:\n"
-	  _context.each do |key, value|
-	     print "*** key=#{key}, value=#{value.inspect}"
-	  end
+  expected: |
+	- name: DOCUMENT
+	  global:
+	    - _context
+	  local:
+	    - i
+	    - item
+	    - title
+	    - list
+	  begin:
+	    - <%    title = _context[:title]%>
+	    - <%    list = _context[:list]%>
+	  end:
+	    - print(<%="*** debug:\n"%>)
+	    - <%    _context.each do |key, value|%>
+	    - print(<%="*** key=#{key}, value=#{value.inspect}"%>)
+	    - <%    end%>
+###
+- name:  parse_comment1_css
+  style:  css
+  plogic: |
+	/* 
+	 * region comment
+	 */
+	#foo {
+	  // line comment
+	  value:  foo;
 	}
-      }
+	/* tail comment may cause parse error! */
   expected: |
-      - name: "DOCUMENT"
-        global:
-          - _context
-        local:
-          - i
-          - item
-          - title
-          - list
-        begin:
-          - "    title = _context[:title]"
-          - "    list = _context[:list]"
-        end:
-          - [ <%="*** debug:\n"%>]
-          - "    _context.each do |key, value|"
-          - [ <%="*** key=#{key}, value=#{value.inspect}"%>]
-          - "    end"
+	- name: foo
+	  cont: foo
 
+- name:  parse_comment2_css
+  style:  css
+  plogic*:
+    ruby: |
+	#foo {
+	  value: item;   // line comment
+	  logic: {
+	     _elem     ## ruby comment
+	  }
+	}
+    php: |
+	#foo {
+	  value: item;   // line comment
+	  logic: {
+	     _elem     // ruby comment
+	  }
+	}
+  expected: |
+	- name: foo
+	  cont: item
+	  logic:
+	    - _elem
 
----
+###
 - name:  parse_element_all1_css
-  parser: CssStyleParser
-  input: |
-    #list {
-      value:   item.name;
-      attrs:   'title' item.desc,
-               'class' klass;
-      append:  item==current_item ? ' checked="checked"' : '';
-      logic:  {
-        @list.each_with_index { |item, i|
-          klass = i % 2 == 0 ? 'even' : 'odd'
-          _stag     # start tag
-          _cont     # content
-          _etag     # end tag
-        }
-      }
-    }
-  expected: &all1|
-    - name: "list"
-      cont: "item.name"
-      attrs:
-        - name:  "class"
-          value: "klass"
-        - name:  "title"
-          value: "item.desc"
-      append:
-        - "item==current_item ? ' checked=\"checked\"' : ''"
-      logic:
-        - "    @list.each_with_index { |item, i|"
-        - "      klass = i % 2 == 0 ? 'even' : 'odd'"
-        - _stag
-        - _cont
-        - _etag
-        - "    }"
+  style: css
+  plogic: |
+	#item {
+	  stag:   start_link_tag('user', 'name');
+	  etag:   end_link();
+	  elem:   link_to_remote('user', 'name');
+	  value:  $item;
+	  attrs:  "href" $href,
+	          'class' $class,
+	          'bgcolor' $color;
+	  append: $gender == "M" ? " checked=\"checked\"" : "",
+	          $obsolete ? ' disabled="disabled"' : '';
+	  remove: "id", 'title', 'xml:lang';
+	  logic: {
+	    $i = 0;
+	    foreach ($list as $item) {
+	      $color = ++$i % 2 == 0 ? "#CCCCFF" : "#FFCCCC";
+	      _stag();
+	      _cont();
+	      _etag();
+	    }
+	  }
+	}
+  expected: &all1 |
+	- name: item
+	  stag: start_link_tag('user', 'name')
+	  cont: $item
+	  etag: end_link()
+	  elem: link_to_remote('user', 'name')
+	  attrs:
+	    - name:  bgcolor
+	      value: $color
+	    - name:  class
+	      value: $class
+	    - name:  href
+	      value: $href
+	  append:
+	    - $gender == "M" ? " checked=\"checked\"" : ""
+	    - $obsolete ? ' disabled="disabled"' : ''
+	  remove:
+	    - id
+	    - title
+	    - xml:lang
+	  logic:
+	    - <%    $i = 0;%>
+	    - <%    foreach ($list as $item) {%>
+	    - <%      $color = ++$i % 2 == 0 ? "#CCCCFF" : "#FFCCCC";%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%    }%>
 
 - name:  parse_element_all1_ruby
-  parser: RubyStyleParser
-  input: |
-    element "list" {
-      value   item.name
-      attrs   'title'=>item.desc, 'class'=>klass
-      append  item==current_item ? ' checked="checked"' : ''
-      logic  {
-        @list.each_with_index { |item, i|
-          klass = i % 2 == 0 ? 'even' : 'odd'
-          _stag     # start tag
-          _cont     # content
-          _etag     # end tag
-        }
-      }
-    }
-  expected: *all1
-
+  style: ruby
+  plogic: |
+	element "item" {
+	  stag    start_link_tag('user', 'name')
+	  etag    end_link()
+	  elem    link_to_remote('user', 'name')
+	  value   item
+	  attrs   'href'=>href, 'class'=>class, 'bgcolor'=>color
+	  append  gender == "M" ? " checked=\"checked\"" : "", obsolete ? ' disabled="disabled"' : ''
+	  remove  "id", 'title', 'xml:lang'
+	  logic {
+	    @list.each_with_index do |item, i|
+	      color = i % 2 == 0 ? "#CCCCFF" : "#FFCCCC"
+	      _stag
+	      _cont
+	      _etag
+	    end
+	  }
+	}
+  expected: |
+	- name: item
+	  stag: start_link_tag('user', 'name')
+	  cont: item
+	  etag: end_link()
+	  elem: link_to_remote('user', 'name')
+	  attrs:
+	    - name:  bgcolor
+	      value: color
+	    - name:  class
+	      value: class
+	    - name:  href
+	      value: href
+	  append:
+	    - gender == "M" ? " checked=\"checked\"" : ""
+	    - obsolete ? ' disabled="disabled"' : ''
+	  remove:
+	    - id
+	    - title
+	    - xml:lang
+	  logic:
+	    - <%    @list.each_with_index do |item, i|%>
+	    - <%      color = i % 2 == 0 ? "#CCCCFF" : "#FFCCCC"%>
+	    - _stag
+	    - _cont
+	    - _etag
+	    - <%    end%>