emfrp 0.1.2 → 0.1.3

data/tests/Rakefile.common

@@ -1,27 +1,27 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'emfrp'
-
-TARGETS = Dir.glob("./*.mfrp").map{|x| x =~ /^\.\/(.*).mfrp$/; $1}
-
-def exec_test(file_name)
-  puts "TESTING #{file_name}".colorize(:light_blue)
-  inter = Emfrp::Interpreter.new(Emfrp::IncludeDirs, STDOUT, file_name)
-  unless inter.exec_embedded_commands(true)
-    puts " => ok".colorize(:green)
-  else
-    puts " => fail".colorize(:red)
-  end
-rescue => err
-  puts err.inspect
-  puts " => fail".colorize(:red)
-end
-
-TARGETS.each do |t|
-  file t do
-    exec_test(t)
-  end
-end
-
-file "Std" do
-  exec_test("Std")
-end
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'emfrp'
+
+TARGETS = Dir.glob("./*.mfrp").map{|x| x =~ /^\.\/(.*).mfrp$/; $1}
+
+def exec_test(file_name)
+  puts "TESTING #{file_name}".colorize(:light_blue)
+  inter = Emfrp::Interpreter.new(Emfrp::IncludeDirs, STDOUT, file_name)
+  unless inter.exec_embedded_commands(true)
+    puts " => ok".colorize(:green)
+  else
+    puts " => fail".colorize(:red)
+  end
+rescue => err
+  puts err.inspect
+  puts " => fail".colorize(:red)
+end
+
+TARGETS.each do |t|
+  file t do
+    exec_test(t)
+  end
+end
+
+file "Std" do
+  exec_test("Std")
+end

data/tests/command/Rakefile

@@ -1,2 +1,2 @@
-load File.expand_path('../../Rakefile.common', __FILE__)
-task :default => TARGETS
+load File.expand_path('../../Rakefile.common', __FILE__)
+task :default => TARGETS

data/tests/command/ReplaceNode.mfrp

@@ -1,39 +1,39 @@
-module ReplaceNodeCommand in x : Int out y use Std
-
-node a = x + 1
-node b = a + 1
-node c = b + 1
-
-node i = x + 2
-node j = i + 2
-node k = j + 2
-
-node z = 1.0
-
-node init[0] p = 1
-node q = 0
-
-node y = c
-
-#@ :assert-error replace_node_err1 =>
-#-   :replace-node hoge => b
-
-#@ :assert-error replace_node_err2 =>
-#-   :replace-node b => hoge
-
-#@ :assert-error replace_node_err3 =>
-#-   :replace-node b => z
-
-#@ :assert-error replace_node_err4 =>
-#-   :replace-node c => b
-
-#@ :assert-error replace_node_err4 =>
-#-   :replace-node a => b
-
-#@ :assert-error replace_node_err5 =>
-#-   :replace-node p => q
-
-#@ :replace-node b => j
-#@ :assert-module
-#-   0 => 5
-#@ : 1 => 6
+module ReplaceNodeCommand in x : Int out y use Std
+
+node a = x + 1
+node b = a + 1
+node c = b + 1
+
+node i = x + 2
+node j = i + 2
+node k = j + 2
+
+node z = 1.0
+
+node init[0] p = 1
+node q = 0
+
+node y = c
+
+#@ :assert-error replace_node_err1 =>
+#-   :replace-node hoge => b
+
+#@ :assert-error replace_node_err2 =>
+#-   :replace-node b => hoge
+
+#@ :assert-error replace_node_err3 =>
+#-   :replace-node b => z
+
+#@ :assert-error replace_node_err4 =>
+#-   :replace-node c => b
+
+#@ :assert-error replace_node_err4 =>
+#-   :replace-node a => b
+
+#@ :assert-error replace_node_err5 =>
+#-   :replace-node p => q
+
+#@ :replace-node b => j
+#@ :assert-module
+#-   0 => 5
+#@ : 1 => 6

data/tests/compiler/ComplexDataType/ComplexDataType.mfrp

@@ -1,14 +1,14 @@
-module ComplexDataType
-in i : Int
-out out1, out2
-use Std
-
-node x = ((i, i), (i, i), (i, i))
-
-node y = {
-  ii = i.intToDouble
-  ((ii, ii), (ii, ii), (ii, ii))
-}
-
-node out1 = x of ((a, _), _, _) -> a
-node out2 = y of ((a, _), _, _) -> a
+module ComplexDataType
+in i : Int
+out out1, out2
+use Std
+
+node x = ((i, i), (i, i), (i, i))
+
+node y = {
+  ii = i.intToDouble
+  ((ii, ii), (ii, ii), (ii, ii))
+}
+
+node out1 = x of ((a, _), _, _) -> a
+node out2 = y of ((a, _), _, _) -> a

data/tests/compiler/ComplexDataType/ComplexDataTypeMain.c

@@ -1,15 +1,15 @@
-#include "ComplexDataType.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-void Input(int* i) {
-  if (scanf("%d", i) == EOF) {
-    exit(0);
-  }
-}
-void Output(int* out1, double* out2) {
-  printf("%d %.3lf\n", *out1, *out2);
-}
-int main() {
-  ActivateComplexDataType();
-}
+#include "ComplexDataType.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void Input(int* i) {
+  if (scanf("%d", i) == EOF) {
+    exit(0);
+  }
+}
+void Output(int* out1, double* out2) {
+  printf("%d %.3lf\n", *out1, *out2);
+}
+int main() {
+  ActivateComplexDataType();
+}

data/tests/compiler/ComplexDataType/Rakefile

@@ -1,2 +1,2 @@
-NAME = "ComplexDataType"
-load File.expand_path('../../Rakefile.common', __FILE__)
+NAME = "ComplexDataType"
+load File.expand_path('../../Rakefile.common', __FILE__)

data/tests/compiler/ComplexDataType/in.txt

@@ -1,5 +1,5 @@
-1
-2
-3
-4
-5
+1
+2
+3
+4
+5

data/tests/compiler/LCDClock/LCDClock.mfrp

@@ -1,90 +1,90 @@
-module LCDClock
-in
-  btnMode(False) : Bool,   # Is mode-button pushed now?
-  btnNext(False) : Bool,   # Is next-button pushed now?
-  btnRotate(False) : Bool, # Is rotate-button pushed now?
-  pulse100ms : Bool        # input to be True only once per 100ms
-out
-  hour, min, sec,            # current time to display
-  maskHour, maskMin, maskSec # Is it now needed to display -- instead of two-digits?
-use
-  Std
-
-# Functions
-# --------------------
-
-type Mode = Normal | Edit
-type TPos = HPos | MPos | SPos
-type Time = Time(Int, Int, Int)
-
-func nextMode(m) = m of Normal -> Edit, Edit -> Normal
-
-func editable(m) = m of Normal -> False, Edit -> True
-
-func nextPos(p) = p of HPos -> MPos, MPos -> SPos, SPos -> HPos
-
-func positiveEdge(a, b) = !a && b
-
-# proceed Time by 1sec
-func proceedTime(t) = {
-  Time(h, m, s) = t
-  newS = s + 1
-  newM = m + (newS / 60)
-  newH = h + (newM / 60)
-  Time(newH % 24, newM % 60, newS % 60)
-}
-
-func roundingTime(t, dh, dm, ds) = {
-  Time(h, m, s) = t
-  Time((h + dh) % 24, (m + dm) % 60, (s + ds) % 60)
-}
-
-# Nodes
-# --------------------
-
-# mod-10 counter incremented by every 100ms
-node init[0] counter : Int =
-  (if pulse100ms then counter@last + 1 else counter@last) % 10
-
-# time-varying value to be True only once per 1sec
-node pulse1s : Bool =
-  counter == 0 && counter@last != 0
-
-# time-varying value switching True/False by every 500ms
-node flash : Bool =
-  counter < 5
-
-# time-varying value representing current time-set mode
-node init[Normal] curMode : Mode =
-  if btnMode@last `positiveEdge` btnMode then curMode@last.nextMode else curMode@last
-
-# time-varying value representing current editing-cursor-position
-node init[HPos] curPos : TPos =
-  if btnNext@last `positiveEdge` btnNext then curPos@last.nextPos else curPos@last
-
-# time-varying value representing diffs to add to current time.
-node (dh, dm, ds) : (Int, Int, Int) =
-  if curMode.editable && (btnRotate@last `positiveEdge` btnRotate) then
-    curPos of:
-      HPos -> (1, 0, 0)
-      MPos -> (0, 1, 0)
-      SPos -> (0, 0, 1)
-  else
-    (0, 0, 0)
-
-# time-varying value representing current time
-node init[Time(0, 0, 0)] Time(hour, min, sec) as curTime =
-  if pulse1s then
-    curTime@last.proceedTime.roundingTime(dh, dm, ds)
-  else
-    curTime@last.roundingTime(dh, dm, ds)
-
-# time-varying value representing need of masking
-node (maskHour, maskMin, maskSec) =
-  if curMode.editable && flash then
-    curPos of:
-      HPos -> (True, False, False)
-      MPos -> (False, True, False)
-      SPos -> (False, False, True)
-  else
-    (False, False, False)
+module LCDClock
+in
+  btnMode(False) : Bool,   # Is mode-button pushed now?
+  btnNext(False) : Bool,   # Is next-button pushed now?
+  btnRotate(False) : Bool, # Is rotate-button pushed now?
+  pulse100ms : Bool        # input to be True only once per 100ms
+out
+  hour, min, sec,            # current time to display
+  maskHour, maskMin, maskSec # Is it now needed to display -- instead of two-digits?
+use
+  Std
+
+# Functions
+# --------------------
+
+type Mode = Normal | Edit
+type TPos = HPos | MPos | SPos
+type Time = Time(Int, Int, Int)
+
+func nextMode(m) = m of Normal -> Edit, Edit -> Normal
+
+func editable(m) = m of Normal -> False, Edit -> True
+
+func nextPos(p) = p of HPos -> MPos, MPos -> SPos, SPos -> HPos
+
+func positiveEdge(a, b) = !a && b
+
+# proceed Time by 1sec
+func proceedTime(t) = {
+  Time(h, m, s) = t
+  newS = s + 1
+  newM = m + (newS / 60)
+  newH = h + (newM / 60)
+  Time(newH % 24, newM % 60, newS % 60)
+}
+
+func roundingTime(t, dh, dm, ds) = {
+  Time(h, m, s) = t
+  Time((h + dh) % 24, (m + dm) % 60, (s + ds) % 60)
+}
+
+# Nodes
+# --------------------
+
+# mod-10 counter incremented by every 100ms
+node init[0] counter : Int =
+  (if pulse100ms then counter@last + 1 else counter@last) % 10
+
+# time-varying value to be True only once per 1sec
+node pulse1s : Bool =
+  counter == 0 && counter@last != 0
+
+# time-varying value switching True/False by every 500ms
+node flash : Bool =
+  counter < 5
+
+# time-varying value representing current time-set mode
+node init[Normal] curMode : Mode =
+  if btnMode@last `positiveEdge` btnMode then curMode@last.nextMode else curMode@last
+
+# time-varying value representing current editing-cursor-position
+node init[HPos] curPos : TPos =
+  if btnNext@last `positiveEdge` btnNext then curPos@last.nextPos else curPos@last
+
+# time-varying value representing diffs to add to current time.
+node (dh, dm, ds) : (Int, Int, Int) =
+  if curMode.editable && (btnRotate@last `positiveEdge` btnRotate) then
+    curPos of:
+      HPos -> (1, 0, 0)
+      MPos -> (0, 1, 0)
+      SPos -> (0, 0, 1)
+  else
+    (0, 0, 0)
+
+# time-varying value representing current time
+node init[Time(0, 0, 0)] Time(hour, min, sec) as curTime =
+  if pulse1s then
+    curTime@last.proceedTime.roundingTime(dh, dm, ds)
+  else
+    curTime@last.roundingTime(dh, dm, ds)
+
+# time-varying value representing need of masking
+node (maskHour, maskMin, maskSec) =
+  if curMode.editable && flash then
+    curPos of:
+      HPos -> (True, False, False)
+      MPos -> (False, True, False)
+      SPos -> (False, False, True)
+  else
+    (False, False, False)

data/tests/compiler/LCDClock/Rakefile

@@ -1,2 +1,2 @@
-NAME = "LCDClock"
-load File.expand_path('../../Rakefile.common', __FILE__)
+NAME = "LCDClock"
+load File.expand_path('../../Rakefile.common', __FILE__)

data/tests/compiler/LCDPositioner/LCDPositioner.mfrp

@@ -1,30 +1,30 @@
-module LCDPositioner
-in
-  up : Bool,
-  down : Bool,
-  left : Bool,
-  right : Bool,
-  pulse10ms : Bool
-out
-  x, y
-use
-  Std
-
-node dy = down.boolToInt - up.boolToInt
-node dx = right.boolToInt - left.boolToInt
-
-node init[(False, 0)] (pulse40ms, pulse40msCount) as pulse = {
-  c = (pulse40msCount@last + pulse10ms.boolToInt) % 4
-  (c == 0 && pulse10ms, c)
-}
-
-node init[(0,0)] (x, y) as pos =
-  if pulse40ms then (x@last + dx, y@last + dy) else pos@last
-
-
-#@ :assert-module
-#-   True, False, False, False, True => 0, 0
-#@ : True, False, False, False, True => 0, 0
-#@ : True, False, False, False, True => 0, 0
-#@ : True, False, False, False, True => 0, -1
-#@ : True, False, False, False, True => 0, -1
+module LCDPositioner
+in
+  up : Bool,
+  down : Bool,
+  left : Bool,
+  right : Bool,
+  pulse10ms : Bool
+out
+  x, y
+use
+  Std
+
+node dy = down.boolToInt - up.boolToInt
+node dx = right.boolToInt - left.boolToInt
+
+node init[(False, 0)] (pulse40ms, pulse40msCount) as pulse = {
+  c = (pulse40msCount@last + pulse10ms.boolToInt) % 4
+  (c == 0 && pulse10ms, c)
+}
+
+node init[(0,0)] (x, y) as pos =
+  if pulse40ms then (x@last + dx, y@last + dy) else pos@last
+
+
+#@ :assert-module
+#-   True, False, False, False, True => 0, 0
+#@ : True, False, False, False, True => 0, 0
+#@ : True, False, False, False, True => 0, 0
+#@ : True, False, False, False, True => 0, -1
+#@ : True, False, False, False, True => 0, -1

data/tests/compiler/LCDPositioner/LCDPositionerMain.c

@@ -1,15 +1,15 @@
-#include "LCDPositioner.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-void Input(int* up, int* down, int* left, int* right, int* pulse10ms) {
-  if (scanf("%d %d %d %d %d", up, down, left, right, pulse10ms) == EOF) {
-    exit(0);
-  }
-}
-void Output(int* x, int* y) {
-  printf("%d %d\n", *x, *y);
-}
-int main() {
-  ActivateLCDPositioner();
-}
+#include "LCDPositioner.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void Input(int* up, int* down, int* left, int* right, int* pulse10ms) {
+  if (scanf("%d %d %d %d %d", up, down, left, right, pulse10ms) == EOF) {
+    exit(0);
+  }
+}
+void Output(int* x, int* y) {
+  printf("%d %d\n", *x, *y);
+}
+int main() {
+  ActivateLCDPositioner();
+}

data/tests/compiler/LCDPositioner/Rakefile

@@ -1,2 +1,2 @@
-NAME = "LCDPositioner"
-load File.expand_path('../../Rakefile.common', __FILE__)
+NAME = "LCDPositioner"
+load File.expand_path('../../Rakefile.common', __FILE__)

data/tests/compiler/Rakefile

@@ -1,8 +1,8 @@
-task :default do
-  Dir.glob("[a-zA-Z0-9_]*") do |d|
-    Dir.chdir(d) do
-      puts "moved into directory `#{d}'"
-      sh "rake"
-    end if Dir.exist?(d)
-  end
-end
+task :default do
+  Dir.glob("[a-zA-Z0-9_]*") do |d|
+    Dir.chdir(d) do
+      puts "moved into directory `#{d}'"
+      sh "rake"
+    end if Dir.exist?(d)
+  end
+end

data/tests/compiler/Rakefile.common

@@ -1,23 +1,23 @@
-$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-require 'emfrp'
-
-task :default do
-  begin
-    puts "TESTING #{NAME}".colorize(:light_blue)
-    sh "../../../bin/emfrp #{NAME}.mfrp"
-    sh "cc -c #{NAME}.c"
-    sh "cc -c #{NAME}Main.c"
-    sh "cc #{NAME}.o #{NAME}Main.o -o #{NAME}"
-    sh "./#{NAME} < in.txt > actual_out.txt"
-    sh "rm #{NAME}Main.c.gen"
-    sh "rm #{NAME}.c"
-    sh "rm #{NAME}.h"
-    sh "rm #{NAME}.o"
-    sh "rm #{NAME}Main.o"
-    sh "rm #{NAME}"
-    sh "diff expected_out.txt actual_out.txt -u"
-    puts "  => ok".colorize(:green)
-  rescue
-    puts "  => fail".colorize(:red)
-  end
-end
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+require 'emfrp'
+
+task :default do
+  begin
+    puts "TESTING #{NAME}".colorize(:light_blue)
+    sh "../../../bin/emfrp #{NAME}.mfrp"
+    sh "cc -c #{NAME}.c"
+    sh "cc -c #{NAME}Main.c"
+    sh "cc #{NAME}.o #{NAME}Main.o -o #{NAME}"
+    sh "./#{NAME} < in.txt > actual_out.txt"
+    sh "rm #{NAME}Main.c.gen"
+    sh "rm #{NAME}.c"
+    sh "rm #{NAME}.h"
+    sh "rm #{NAME}.o"
+    sh "rm #{NAME}Main.o"
+    sh "rm #{NAME}"
+    sh "diff expected_out.txt actual_out.txt -u"
+    puts "  => ok".colorize(:green)
+  rescue
+    puts "  => fail".colorize(:red)
+  end
+end

data/tests/compiler/UseData/Rakefile

@@ -1,2 +1,2 @@
-NAME = "UseData"
-load File.expand_path('../../Rakefile.common', __FILE__)
+NAME = "UseData"
+load File.expand_path('../../Rakefile.common', __FILE__)

data/tests/compiler/UseData/UseData.mfrp

@@ -1,8 +1,8 @@
-module UseData out x use Std
-
-
-data one = 1         # one 
-data two = one + 1   # two
-data three = two + 1 # three
-
-node x = three
+module UseData out x use Std
+
+
+data one = 1         # one 
+data two = one + 1   # two
+data three = two + 1 # three
+
+node x = three

data/tests/compiler/UseSubModule/Rakefile

@@ -1,2 +1,2 @@
-NAME = "UseSubModule"
-load File.expand_path('../../Rakefile.common', __FILE__)
+NAME = "UseSubModule"
+load File.expand_path('../../Rakefile.common', __FILE__)

data/tests/compiler/UseSubModule/SubModule.mfrp

@@ -1,8 +1,8 @@
-module SubModule
-in i1 : Int, i2 : Int
-out x, y
-use Std
-
-newnode a = SubModule2(i1)
-node x = a * i2
-node init[0] y = y@last + i2
+module SubModule
+in i1 : Int, i2 : Int
+out x, y
+use Std
+
+newnode a = SubModule2(i1)
+node x = a * i2
+node init[0] y = y@last + i2

data/tests/compiler/UseSubModule/SubModule2.mfrp

@@ -1,5 +1,5 @@
-module SubModule2
-in x : Int
-out y
-
-node y = x
+module SubModule2
+in x : Int
+out y
+
+node y = x

data/tests/compiler/UseSubModule/UseSubModule.mfrp

@@ -1,11 +1,11 @@
-module UseSubModule
-in x : Int
-out a1, b1, a2, b2
-use Std
-
-newnode a1, b1 = SubModule(x, 2)
-newnode a2, b2 = SubModule(x + 1, 3)
-
-#@ :assert-module
-#-   0 => 0, 2, 3, 3
-#@ : 1 => 2, 4, 6, 6
+module UseSubModule
+in x : Int
+out a1, b1, a2, b2
+use Std
+
+newnode a1, b1 = SubModule(x, 2)
+newnode a2, b2 = SubModule(x + 1, 3)
+
+#@ :assert-module
+#-   0 => 0, 2, 3, 3
+#@ : 1 => 2, 4, 6, 6