pione 0.1.1 → 0.1.2

data/test/parser/spec_expr-parser.yml

@@ -13,27 +13,29 @@ expr_operator:
     - "*"
     - "%"
     - "/"
+    - ">>>"
+    - "==>"
 expr_operator_application:
   valid:
-    - true == true
-    - true != false
-    - 10 >= 1
-    - 1 <= 10
-    - 10 > 1
-    - 1 < 10
-    - true && true
-    - true || false
-    - 1 + 1
-    - 1 - 1
-    - 1 * 1
-    - 1 % 1
-    - 1 / 1
+    - "true == true"
+    - "true != false"
+    - "10 >= 1"
+    - "1 <= 10"
+    - "10 > 1"
+    - "1 < 10"
+    - "true && true"
+    - "true || false"
+    - "1 + 1"
+    - "1 - 1"
+    - "1 * 1"
+    - "1 % 1"
+    - "1 / 1"
 message:
   valid:
-    - .abc(1)
-    - .sync
-    - .abc(1, "s", '*.txt')
-    - .abc(1.0.abc(3.def))
+    - ".abc(1)"
+    - ".sync"
+    - ".abc(1, \"s\", '*.txt')"
+    - ".abc(1.0.abc(3.def))"
 rule_expr:
   valid:
     - "&package:rule_name"
@@ -63,20 +65,67 @@ index:
     - "[1,1]"
     - "[1,2,3]"
     - "[1, 2, 3]"
+    - "[\"a\"]"
+    - "[\"a\", \"b\"]"
+    - "[\"a\", \"b\", \"c\"]"
+    - "[1,\n2]"
   invalid:
     - "[]"
-    - "[1,\n2]"
 expr:
   valid:
     - "1"
-    - (1)
+    - "(1)"
     - '"a" == "a"'
     - '"a" != "b"'
-    - true && true
-    - true || false
-    - ($Var1 == "a") && ($Var2 == "b")
-    - ($Var1 == "a") || $Var2
-    - ($Var1 == ($Var2 == "a"))
-    - true == true == true
+    - "true && true"
+    - "true || false"
+    - '($Var1 == "a") && ($Var2 == "b")'
+    - '($Var1 == "a") || $Var2'
+    - '($Var1 == ($Var2 == "a"))'
+    - "true == true == true"
+    # message
+    - 'abc.a'
+    - 'abc.a.b'
+    - 'abc.a.b.c'
+    - 'abc.a("a").b("b").c("c")'
+    # index
     - "abc[1]"
+    - "abc[1,2]"
+    - "abc[1,2,3]"
+    - "abc[1][2]"
+    - "abc[1][2][3]"
+    - "abc[\"a\"]"
+    - "abc[\"a\", \"b\"]"
+    - "abc[\"a\", \"b\", \"c\"]"
+    - "abc[\"a\"][\"b\"]"
+    - "abc[\"a\"][\"b\"][\"c\"]"
+    - "abc [1]"
+    - "abc [1] [2]"
     - "1[1]"
+    # parameters
+    - "abc {}"
+    - "abc {A: 1}"
+    - "abc {A: 1, B: 2}"
+    - "abc{A:1}"
+    - "abc {A:1} {B:2}"
+    # reverse order method
+    - "not :: true"
+    - "not::true"
+    - 'author :: "test"'
+    - 'abc("def") :: "test"'
+    - "a :: (b)"
+    - "a :: (b :: c)"
+    - "a :: b :: c"
+    - "a :: b :: c :: d"
+    # complex form
+    - "abc[1].a"
+    - "abc.a[1]"
+    - "abc.a.b[1][2]"
+    - "abc[1].a"
+    - "abc[1].a.b[2]"
+    - "abc[1] {V:1}"
+  invalid:
+    - "(a) :: b"
+    - "(a :: b) :: c"
+    - "a :: (b :: c) :: d"
+

data/test/parser/spec_literal-parser.yml

@@ -121,3 +121,14 @@ float:
     - '0.1a'
     - '0.a1'
     - '0.1e'
+ticket:
+  valid:
+    - "<t>"
+    - "<T>"
+    - "<1>"
+    - "<Ticket>"
+    - "< T >"
+    - "<T >"
+    - "< T>"
+  invalid:
+    - "<a b>"

data/test/test-util.rb

@@ -120,7 +120,7 @@ module TestUtil::Transformer
     testcases.instance_eval(&b)
     context.describe name do
       testcases.each do |tc|
-        it "should get %s:%s%s" % [name, tc.string.include?("\n") ? "\n" : "", tc.string.chomp] do
+        it "should get %s:%s%s" % [name, tc.string.include?("\n") ? "\n" : " ", tc.string.chomp] do
           res = DocumentTransformer.new.apply(
             DocumentParser.new.send(parser).parse(tc.string)
           )

data/test/transformer/spec_expr-transformer.rb

@@ -3,87 +3,57 @@ require_relative '../test-util'
 describe 'Pione::Transformer::ExprTransformer' do
   transformer_spec("binary operator", :expr) do
     tc "1 + 2" do
-      BinaryOperator.new(
-        "+",
-        PioneInteger.new(1),
-        PioneInteger.new(2)
-      )
+      BinaryOperator.new("+", 1.to_pione, 2.to_pione)
     end
+
     tc '"a" + "b"' do
-      BinaryOperator.new(
-        "+",
-        PioneString.new("a"),
-        PioneString.new("b")
-      )
+      BinaryOperator.new("+", "a".to_pione, "b".to_pione)
     end
+
     tc "false || true" do
-      BinaryOperator.new(
-        "||",
-        PioneBoolean.false,
-        PioneBoolean.true
-      )
-    end
-    tc "$var * 3" do
-      BinaryOperator.new(
-        "*",
-        Variable.new("var"),
-        PioneInteger.new(3)
-      )
+      BinaryOperator.new("||", PioneBoolean.false, PioneBoolean.true)
+    end
+
+    tc "$Var * 3" do
+      BinaryOperator.new("*", Variable.new("Var"), 3.to_pione)
     end
+
     tc "($Var1 == \"a\") && ($Var2 == \"b\")" do
-      BinaryOperator.new(
-        "&&",
-        BinaryOperator.new(
-          "==",
-          Variable.new("Var1"),
-          PioneString.new("a")
-        ),
-        BinaryOperator.new(
-          "==",
-          Variable.new("Var2"),
-          PioneString.new("b")
-        )
-      )
+      left = BinaryOperator.new("==", Variable.new("Var1"), "a".to_pione)
+      right = BinaryOperator.new("==", Variable.new("Var2"), PioneString.new("b"))
+      BinaryOperator.new("&&", left, right)
     end
   end
 
   transformer_spec("message", :expr) do
     tc "1.next" do
-      Message.new("next", PioneInteger.new(1))
+      Message.new("next", 1.to_pione)
     end
+
     tc "1.next.next" do
-      Message.new(
-        "next",
-        Message.new("next", PioneInteger.new(1))
-      )
+      Message.new("next", Message.new("next", 1.to_pione))
     end
+
     tc "\"abc\".index(1,1)" do
-      Message.new(
-        "index",
-        PioneString.new("abc"),
-        PioneInteger.new(1),
-        PioneInteger.new(1)
-      )
+      Message.new("index", "abc".to_pione, 1.to_pione, 1.to_pione)
     end
+
     tc "(1 + 2).prev" do
-      Message.new(
-        "prev",
-        BinaryOperator.new(
-          "+",
-          PioneInteger.new(1),
-          PioneInteger.new(2)
-        )
-      )
+      Message.new("prev", BinaryOperator.new("+", 1.to_pione, 2.to_pione))
     end
+
     tc "abc.sync" do
       Message.new("sync", RuleExpr.new(Package.new("main"), "abc"))
     end
+
     tc "'*.txt'.all" do
       Message.new("all", DataExpr.new("*.txt"))
     end
+
     tc "'*.txt'.all()" do
       Message.new("all", DataExpr.new("*.txt"))
     end
+
     tc "'*.txt'.all(true)" do
       Message.new("all", DataExpr.new("*.txt"), PioneBoolean.true)
     end
@@ -93,12 +63,15 @@ describe 'Pione::Transformer::ExprTransformer' do
     tc "{}" do
       Parameters.new({})
     end
+
     tc "{var1: 1}" do
       {"var1" => 1}.to_params
     end
+
     tc "{var1: 1, var2: 2}" do
       {"var1" => 1, "var2" => 2}.to_params
     end
+
     tc "{var1: \"a\", var2: \"b\", var3: \"c\"}" do
       {"var1" => "a", "var2" => "b", "var3" => "c"}.to_params
     end

data/test/transformer/spec_literal-transformer.rb

@@ -55,4 +55,10 @@ describe 'Pione::Transformer::LiteralTransformer' do
   transformer_spec('rule_name', :rule_name) do
     tc("abc" => RuleExpr.new(Package.new("main"), "abc"))
   end
+
+  transformer_spec('ticket', :ticket) do
+    tc("<T>" => Ticket.new("T"))
+    tc("< T>" => Ticket.new("T"))
+    tc("<T >" => Ticket.new("T"))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pione
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.15
+- !ruby/object:Gem::Dependency
+  name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: naming
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +287,7 @@ files:
 - example/MakePair/data/3.i
 - example/MakePair/data/4.i
 - example/MakePair/data/5.i
+- example/SequentialProcess/SequentialProcess.pione
 - example/SieveOfEratosthenes/SieveOfEratosthenes.pione
 - example/SingleParticlesWithRef/Makefile
 - example/SingleParticlesWithRef/SingleParticlesWithRef.Display2.pione
@@ -426,6 +443,7 @@ files:
 - lib/pione/model/rule-io.rb
 - lib/pione/model/rule.rb
 - lib/pione/model/string.rb
+- lib/pione/model/ticket-expr.rb
 - lib/pione/model/undefined-value.rb
 - lib/pione/model/variable-table.rb
 - lib/pione/model/variable.rb
@@ -437,8 +455,8 @@ files:
 - lib/pione/parser/feature-expr-parser.rb
 - lib/pione/parser/flow-element-parser.rb
 - lib/pione/parser/literal-parser.rb
+- lib/pione/parser/parslet-extension.rb
 - lib/pione/parser/rule-definition-parser.rb
-- lib/pione/parser/syntax-error.rb
 - lib/pione/patch/array-patch.rb
 - lib/pione/patch/drb-patch.rb
 - lib/pione/patch/monitor-patch.rb
@@ -467,6 +485,7 @@ files:
 - lib/pione/system/identifier.rb
 - lib/pione/system/init.rb
 - lib/pione/system/object.rb
+- lib/pione/transformer.rb
 - lib/pione/transformer/block-transformer.rb
 - lib/pione/transformer/document-transformer.rb
 - lib/pione/transformer/expr-transformer.rb
@@ -501,14 +520,15 @@ files:
 - lib/pione/tuple/shift-tuple.rb
 - lib/pione/tuple/task-tuple.rb
 - lib/pione/tuple/task-worker-resource-tuple.rb
+- lib/pione/tuple/ticket-tuple.rb
 - lib/pione/tuple/working-tuple.rb
 - lib/pione/uri-scheme/basic-scheme.rb
 - lib/pione/uri-scheme/broadcast-scheme.rb
 - lib/pione/uri-scheme/dropbox-scheme.rb
 - lib/pione/uri-scheme/local-scheme.rb
+- lib/pione/util/console-message.rb
 - lib/pione/util/error-report.rb
 - lib/pione/util/log.rb
-- lib/pione/util/message.rb
 - lib/pione/util/misc.rb
 - lib/pione/util/terminal.rb
 - lib/pione/util/waiter-table.rb
@@ -547,6 +567,7 @@ files:
 - test/model/spec_rule-io.rb
 - test/model/spec_rule.rb
 - test/model/spec_string.rb
+- test/model/spec_ticket-expr.rb
 - test/model/spec_variable-table.rb
 - test/model/spec_variable.rb
 - test/parser/spec_block-parser.rb
@@ -616,7 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1058953212253299218
+      hash: 1523774398215455370
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -650,6 +671,7 @@ test_files:
 - test/model/spec_rule-io.rb
 - test/model/spec_rule.rb
 - test/model/spec_string.rb
+- test/model/spec_ticket-expr.rb
 - test/model/spec_variable-table.rb
 - test/model/spec_variable.rb
 - test/parser/spec_block-parser.rb

data/lib/pione/parser/syntax-error.rb

@@ -1,61 +0,0 @@
-module Pione
-  module Parser
-    # ParserError is raised when the parser finds syntax error.
-    class ParserError < Parslet::ParseFailed
-      # Creates an error.
-      # @param [String] str
-      #   target string
-      # @param [Array<String>] expected
-      #   expected names
-      # @param [Parslet::Source] source
-      #   parser source
-      def initialize(str, expected, source)
-        @str = str
-        @expected = expected
-        @source = source
-        super(str)
-      end
-
-      # @api private
-      def message
-        line, column = @source.line_and_column
-        expected = @expected.join(", ")
-        left = @source.consume(@source.chars_left)
-        "%s(expected: %s, line: %s, column: %s):\n%s" % [
-          @str, expected, line, column, left
-        ]
-      end
-    end
-
-    # @api private
-    class SyntaxErrorAtom < Parslet::Atoms::Base
-      def initialize(msg, expected_elements=[])
-        @msg = msg
-        @expected_elements = expected_elements
-      end
-
-      def try(source, context)
-        raise ParserError.new(@msg, @expected_elements, source)
-      end
-
-      def to_s_inner(prec)
-        "SYNTAX_ERROR"
-      end
-    end
-
-    # SyntaxError provides notification methods for syntax error.
-    module SyntaxError
-      # Raises syntax error. This method returns a dummy atom and the parser
-      # evaluates it as error.
-      # @param [String] msg
-      #   error message
-      # @param [Array<String>] expected_elements
-      #   expected name list
-      # @return [SyntaxErrorAtom]
-      #   dummy atom for parser
-      def syntax_error(msg, *expected_elements)
-        SyntaxErrorAtom.new(msg, expected_elements)
-      end
-    end
-  end
-end