pione 0.1.3 → 0.1.4

data/History.txt

@@ -1,6 +1,17 @@
 # History
 
-## 0.1.3(2013/04/XX)
+## 0.1.4(2013/05/13)
+
+* Sequence based expressions.
+* Enable to distribute tasks based on parameters.
+* Added many methods.
+* Added annotations.
+* Added remove and touch operation as data tuple operations.
+* Modified update criteria.
+* Added empty rule.
+* Added new examples.
+
+## 0.1.3(2013/04/25)
 
 * Added new data expression literal "null" for accepting data nonexistence
 * Added new data expression property keyword "neglect" and "care" for the update criterion about data mtime

data/example/AbstractRule/AbstractRule.pione

@@ -0,0 +1,40 @@
+Rule Main
+  output 'message.txt'
+  param $NAME := "A"
+Flow
+  case $NAME
+  when "A"
+    $RULE := A
+  when "B"
+    $RULE := B
+  when "C"
+    $RULE := C
+  end
+  rule Abstract {R: $RULE}
+End
+
+Rule Abstract
+  output 'message.txt'
+  param $R
+Flow
+  rule $R
+End
+
+Rule A
+  output 'message.txt'
+Action
+  echo "This is rule A." > {$O[1]}
+End
+
+Rule B
+  output 'message.txt'
+Action
+  echo "This is rule B." > {$O[1]}
+End
+
+Rule C
+  output 'message.txt'
+Action
+  echo "This is rule C." > {$O[1]}
+End
+

data/example/Fib/Fib.pione

@@ -1,25 +1,31 @@
-param $NUM := 3
+@ author :: "Keita Yamaguchi"
+@ "Fib.pione calculates the value of Fibonacci number."
+
+param ($NUM := 3)
 
 Rule Main
   output 'result.txt'
 Flow
   rule Fib {N: $NUM}
-  rule Result {N: $NUM}
+  rule Result
 End
 
 Rule Fib0
+  @ "the value of fib(0) is 0"
   output 'fib0.txt'
 Action
   echo -n '0' > fib0.txt
 End
 
 Rule Fib1
+  @ "the value of fib(1) is 1"
   output 'fib1.txt'
 Action
   echo -n '1' > fib1.txt
 End
 
 Rule Fib
+  @ "fib(n) is fib(0), fib(1), or fib(n-1) + fib(n-2)"
   output 'fib{$N}.txt'
   param $N
 Flow
@@ -38,6 +44,7 @@ Flow
 End
 
 Rule Calc
+  @ "calculate the value of fib(n-1) + fib(n-2)"
   input 'fib{$P1}.txt'
   input 'fib{$P2}.txt'
   output 'fib{$N}.txt'
@@ -49,9 +56,9 @@ Action
 End
 
 Rule Result
-  input 'fib{$N}.txt'
+  @ "make the result"
+  input 'fib*.txt'
   output 'result.txt'
-  param $N
 Action
-  cat {$I[1]} > {$O[1]}
+  cp {$I[1]} {$O[1]}
 End

data/example/LucasNumber/LucasNumber.pione

@@ -3,7 +3,7 @@ Rule Main
   param $NUM := 10
 Flow
   rule LucasNumber.params({NUM: $NUM})
-  rule Result
+  rule Result {NUM: $NUM}
 End
 
 Rule LucasNumber

data/example/MakePair/MakePair.pione

@@ -2,13 +2,28 @@ Rule Main
   input '*.i'.all
   output '*.pair'.all
 Flow
-  rule MakePair
+  rule SuccessorPair
+  rule PermutationPair
+  rule CombinationPair
 End
 
-Rule MakePair
+Rule SuccessorPair
   input '*.i'
-  input '{$*.as_int + 1}.i'
-  output '{$*}-{$*.as_int + 1}.pair'
-Action
-  touch {$O[1]}
+  input '*.i'
+  output 'succ-{$I[1][1]}-{$I[2][1]}.pair'.touch
+  constraint ($I[1][1].i + 1) == $I[2][1].i
+End
+
+Rule PermutationPair
+  input '*.i'
+  input '*.i'
+  output 'perm-{$I[1][1]}-{$I[2][1]}.pair'.touch
+  constraint $I[1][1].i != $I[2][1].i
+End
+
+Rule CombinationPair
+  input '*.i'
+  input '*.i'
+  output 'comb-{$I[1][1]}-{$I[2][1]}.pair'.touch
+  constraint $I[1][1].i < $I[2][1].i
 End

data/example/OddSelector/OddSelector.pione

@@ -0,0 +1,17 @@
+Rule Main
+  input '*.i'.all
+  output '*.res'.all
+Flow
+  rule OddFilter >>> MakeResult
+End
+
+Rule OddFilter
+  input '*.i'
+  output '*.i'.remove
+  constraint ($I[1][1].i % 2) == 0
+End
+
+Rule MakeResult
+  input '*.i'
+  output '{$*}.res'.touch
+End

data/example/SequentialParameter/SequentialParameter.pione

@@ -0,0 +1,4 @@
+Rule Main
+  output '{$N}.i'.touch
+  param $N := 1.upto(10)
+End

data/example/SieveOfEratosthenes/SieveOfEratosthenes.pione

@@ -1,62 +1,50 @@
-param $MAX := 20
+param $MAX := 10
 
 Rule Main
   output '*.prime'.all
 Flow
-  rule Sieve
+  rule CreateUndeterminedNumbers >>> Sieve
+End
+
+Rule CreateUndeterminedNumbers
+  output '*.ud'.all
+  param $N := 2.upto($MAX)
+Flow
+  rule CreateData {NAME: "{$N}.ud"}
 End
 
 Rule Sieve
-  input '*-*.not_prime'.all or null
-  output '*.current'.all or '*.prime'.all
-  param $NUM := 2
+  input '*.ud'.all or null
+  input '*.prime'.all or null
+  output '*.prime'.all.neglect
+  output 'finished'
+  param $N := 2
 Flow
-  $NEXT_NUM := $NUM + 1
-  $NEXT_RULE := Sieve {NUM: $NEXT_NUM}
-  rule Current {N: $NUM}
-  if not :: $*.as_data_expr.match?($NUM.as_string)
-    rule CreatePrime {N: $NUM}
-    if ($NUM * $NUM) <= $MAX
-      rule CreateNotPrimeAll {P: $NUM} >>> $NEXT_RULE
+  if $*.as_data_expr.match?($N.str)
+    if ($N * $N) <= $MAX
+      rule CreateData {NAME: "{$N}.prime"} >>> RemoveUndeterminedNumber >>> Sieve {N: $N+1}
     else
-      rule $NEXT_RULE
+      rule UndeterminedNumber2Prime
+      rule CreateData {NAME: "finished"}
     end
   else
-    if $NEXT_NUM <= $MAX
-      rule $NEXT_RULE
-    end
+    rule Sieve {N: $N+1}
   end
 End
 
-Rule CreateNotPrimeAll
-  output '*-{$P}.not_prime'.all
-  param $P
-  param $INDEX := 2
-Flow
-  if ($P * ($INDEX + 1)) <= $MAX
-    rule CreateNotPrimeAll {P: $P, INDEX: $INDEX + 1}
-  end
-  rule CreateNotPrime {P: $P, N: $P * $INDEX}
+Rule RemoveUndeterminedNumber
+  input '*.prime'
+  input '*.ud'
+  output '{$I[2][1]}.ud'.remove
+  constraint ($I[2][1].i % $I[1][1].i) == 0
 End
 
-Rule CreateNotPrime
-  output '{$N}-{$P}.not_prime'
-  param $P
-  param $N
-Action
-  touch {$N}-{$P}.not_prime
+Rule UndeterminedNumber2Prime
+  input '*.ud'
+  output '{$*}.prime'.touch
 End
 
-Rule CreatePrime
-  output '{$N}.prime'
-  param $N
-Action
-  touch {$N}.prime
+Rule CreateData
+  param $NAME
+  output '{$NAME}'.touch
 End
-
-Rule Current
-  output '{$N}.current'
-  param $N
-Action
-  touch {$N}.current
-End

data/example/SingleParticlesWithRef/SingleParticlesWithRef.pione

@@ -102,7 +102,7 @@ Rule Create3dlst
   input '*.3dinfo'.all
   output '{$TARGET}.3dlst'
 Action
-  cat {$I[1].join(" ")} | sort > {$TARGET}.3dlst
+  cat {$I[1].as_string.join(" ")} | sort > {$TARGET}.3dlst
 End
 
 # .3dlst.3d

data/example/Touch/Touch.pione

@@ -0,0 +1,3 @@
+Rule Main
+  output 'touched'.touch
+End

data/lib/pione/command/pione-syntax-checker.rb

@@ -40,9 +40,9 @@ module Pione
         when :readline
           action_readline_mode
         when :file
-          print_result(Pathname.new(option[:document]).read)
+          print_result(DocumentParser.new, Pathname.new(option[:document]).read)
         when :expr
-          print_result(option[:expr])
+          print_result(DocumentParser.new.expr, option[:expr])
         end
       end
 
@@ -109,10 +109,10 @@ module Pione
       # @param str [String]
       #   PIONE expression
       # @return [void]
-      def print_result(str)
+      def print_result(parser, str)
         begin
           puts Terminal.green("syntax:")
-          stree = DocumentParser.new.parse(str)
+          stree = parser.parse(str)
           pp stree
           if option[:transform]
             puts Terminal.green("model:")

data/lib/pione/model/assignment.rb

@@ -10,7 +10,7 @@ module Pione
     #   # assigning a variable value
     #   $X := $Y
     #   # => Assignment.new(Variable.new('X'), Variable.new('Y'))
-    class Assignment < BasicModel
+    class Assignment < Callable
       set_pione_model_type TypeAssignment
 
       # Return the variable part of assignment.
@@ -99,5 +99,10 @@ module Pione
         @variable.hash + @expr.hash
       end
     end
+
+    # class AssignmentSequence < Sequence
+    #   set_pione_model_type TypeAssignment
+    #   set_element_class Assignment
+    # end
   end
 end