emfrp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47841f28c3f4f205e6ffd86414321a77b8f94600
-  data.tar.gz: e6652a888ebe7432b7c4b8b95523cf7c6f350a29
+  metadata.gz: b22236346a774cffb9cf18b119085b0177a0aab6
+  data.tar.gz: f0aeb3ec0dd857f2ba08678f0a34b8398bd529a9
 SHA512:
-  metadata.gz: f49280862f5de248a70dcd7b7aaf7ad2912273ece39531961815b4e4e2ac928d63a47a3cd7cde8eac4ab4726a400bb54c1685bd6beb5e96c2f0a55cf5a2f0ed6
-  data.tar.gz: 12c38a3ab709acbdc13e544f716f2c598e2869f3871bfee00ac0d9b6abf854c89c948e67bf8ea69846e2ee33710815743d3315a7bb0185a811f67563211bd625
+  metadata.gz: bbbbb76bac2428193c34ce526269dfa8d524116de18f419a6d1536809eb655449e3f7c186511ea99bad08fca175a7c501092bb05381a6e4c7b3a5812b3534610
+  data.tar.gz: 29135f70e0b9607465857decad838a735ef00dd93db938a1b5b98dc17b53af31eeaaff244be759578ad06dc9704373bcf435c374c5abea53f00dec8e9bcefeec

data/lib/emfrp/compile/c/monofy.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Emfrp
   class Monofy
     IType = Struct.new(:typing, :type_def) do
@@ -32,14 +34,14 @@ module Emfrp
 
     def used_nodes
       used = []
+      visited = Set.new
       f = proc do |n|
         used << n
+        visited << n[:name]
         n[:params].each do |p|
           pn = @top[:dict][:node_space][p[:name][:desc]].get
           if pn.is_a?(NodeDef)
-            if p[:last]
-              used << pn
-            else
+            if !visited.include?(p[:name])
               f.call(pn)
             end
           end

data/lib/emfrp/compile/c/syntax_exp_codegen.rb

@@ -55,7 +55,7 @@ module Emfrp
       stmts << "#{ct.tref(self)} #{vname};"
       left = self[:exp]
       if left.is_a?(VarRef)
-        left_vname = ct.escape_name(left[:name][:desc])
+        left_vname = left[:binder].get.var_name(ct, left[:name][:desc])
       else
         left_vname = "_tmp%03d" % ct.uniq_id_gen
         stmts.unshift "#{ct.tref(left)} #{left_vname};"
@@ -94,7 +94,7 @@ module Emfrp
           if type_def.enum?(ct)
             conds << "#{receiver} == #{tvalue_id}"
           else
-            conds << "#{receiver}" + accessor + "tvalue_type == " + tvalue_id.to_s
+            conds << "#{receiver}" + accessor + "tvalue_id == " + tvalue_id.to_s
           end
         end
         new_receiver = "#{receiver}" + accessor + "value." + pattern[:name][:desc]

data/lib/emfrp/parser/newnode_convert.rb

@@ -11,7 +11,7 @@ module Emfrp
         input[:name][:desc] << "##{uniq_key}"
         top[:nodes] << NodeDef.new(
           :name => input[:name],
-          :init_exp => nil,
+          :init_exp => input[:init_exp],
           :params => nil,
           :type => nil,
           :exp => arg_exp,

data/lib/emfrp/parser/parser.rb

@@ -56,14 +56,14 @@ module Emfrp
           width = lines[ln].chars.take_while{|c| c == "\s"}.size
           ((ln+1)..(len-1)).each do |ln2|
             width2 = lines[ln2].chars.take_while{|c| c == "\s"}.size
-            if lines[ln2].strip == ""
+            if ln2 == len - 1
+              lines[ln2] << " :endcase"
+              break
+            elsif lines[ln2].strip == ""
               next
             elsif width2 <= width
               lines[ln2 - 1] << " :endcase"
               break
-            elsif ln2 == len - 1
-              lines[ln2] << " :endcase"
-              break
             end
           end
         end

data/lib/emfrp/version.rb

@@ -1,3 +1,3 @@
 module Emfrp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/tests/compiler/AtlastDependency/AtlastDependency.mfrp

@@ -0,0 +1,7 @@
+module AtlastDependency out delay3A use Std
+
+node init[0] a = a@last + 1
+node init[0] delayA = a@last
+node init[0] delay2A = delayA@last
+node init[0] delay3A = delay2A@last
+

data/tests/compiler/AtlastDependency/AtlastDependencyMain.c

@@ -0,0 +1,19 @@
+#include "AtlastDependency.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+int i = 0;
+
+void Input() {
+}
+
+void Output(int* delay3A) {
+  printf("%d\n", *delay3A);
+  if (++i == 10) {
+    exit(0);
+  }
+}
+
+int main() {
+  ActivateAtlastDependency();
+}

data/tests/compiler/AtlastDependency/Rakefile

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

data/tests/compiler/AtlastDependency/actual_out.txt

@@ -0,0 +1,10 @@
+0
+0
+0
+1
+2
+3
+4
+5
+6
+7

data/tests/compiler/AtlastDependency/expected_out.txt

@@ -0,0 +1,10 @@
+0
+0
+0
+1
+2
+3
+4
+5
+6
+7

data/tests/compiler/NestedMatch/NestedMatch.mfrp

@@ -0,0 +1,29 @@
+module NestedMatch
+in tag : Int, value : Int
+out x
+use Std
+
+type Tag = T1 | T21 | T22 | T33 | T34
+type InnerA = Inner1(Int) | Inner2(Int,Int)
+type InnerB = Inner3(Int) | Inner4(Int,Int)
+type Outer = Outer1(Int) | Outer2(InnerA) | Outer3(InnerB)
+
+node mid =
+  tag of:
+    0 -> Outer1(value)
+    1 -> Outer2(Inner1(value))
+    2 -> Outer2(Inner2(value,0))
+    3 -> Outer3(Inner3(value))
+    4 -> Outer3(Inner4(value,0))
+    _ -> Outer1(-1)
+
+node x = 
+  mid of:
+    Outer1(a) -> a
+    Outer2(innerA) -> innerA of:
+                        Inner1(a) -> a
+                        Inner2(a, _) -> a
+    Outer3(innerB) -> innerB of:
+                        Inner3(a) -> a
+                        Inner4(a, _) -> a
+

data/tests/compiler/NestedMatch/NestedMatchMain.c

@@ -0,0 +1,20 @@
+#include "NestedMatch.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void Input(int* tag, int* value) {
+  static int counter = 0;
+  *tag = counter;
+  counter = (counter + 1) % 5;
+  if (scanf("%d", value) == EOF) {
+    exit(0);
+  }
+}
+
+void Output(int* x) {
+  printf("%d\n", *x);
+}
+
+int main() {
+  ActivateNestedMatch();
+}

data/tests/compiler/NestedMatch/Rakefile

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

data/tests/compiler/NestedMatch/actual_out.txt

@@ -0,0 +1,10 @@
+5
+10
+15
+20
+25
+30
+25
+40
+45
+50

data/tests/compiler/NestedMatch/expected_out.txt

@@ -0,0 +1,10 @@
+5
+10
+15
+20
+25
+30
+25
+40
+45
+50

data/tests/compiler/NestedMatch/in.txt

@@ -0,0 +1,10 @@
+5
+10
+15
+20
+25
+30
+25
+40
+45
+50

data/tests/compiler/SubModuleInit/Delay2.mfrp

@@ -0,0 +1,7 @@
+module Delay2
+in input(0) : Int
+out delay2 : Int
+use Std
+
+node init[0] mid = input@last
+node delay2 = mid@last

data/tests/compiler/SubModuleInit/Rakefile

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

data/tests/compiler/SubModuleInit/SubModuleInit.mfrp

@@ -0,0 +1,7 @@
+module SubModuleInit
+in x : Int, y : Int
+out delay2X : Int, delay2Y : Int
+use Std
+
+newnode delay2X = Delay2(x)
+newnode delay2Y = Delay2(y)

data/tests/compiler/SubModuleInit/SubModuleInitMain.c

@@ -0,0 +1,17 @@
+#include "SubModuleInit.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void Input(int* x, int* y) {
+  if (scanf("%d %d", x, y) == EOF) {
+    exit(0);
+  }
+}
+
+void Output(int* delay2X, int* delay2Y) {
+  printf("%d %d\n", *delay2X, *delay2Y);
+}
+
+int main() {
+  ActivateSubModuleInit();
+}

data/tests/compiler/SubModuleInit/actual_out.txt

@@ -0,0 +1,10 @@
+0 0
+0 0
+1 2
+3 4
+5 6
+7 8
+9 10
+11 12
+13 14
+15 16

data/tests/compiler/SubModuleInit/expected_out.txt

@@ -0,0 +1,10 @@
+0 0
+0 0
+1 2
+3 4
+5 6
+7 8
+9 10
+11 12
+13 14
+15 16

data/tests/compiler/SubModuleInit/in.txt

@@ -0,0 +1,10 @@
+1 2
+3 4
+5 6
+7 8
+9 10
+11 12
+13 14
+15 16
+17 18
+19 20

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emfrp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -138,6 +138,12 @@ files:
 - tests/Rakefile.common
 - tests/command/Rakefile
 - tests/command/ReplaceNode.mfrp
+- tests/compiler/AtlastDependency/AtlastDependency.mfrp
+- tests/compiler/AtlastDependency/AtlastDependencyMain.c
+- tests/compiler/AtlastDependency/Rakefile
+- tests/compiler/AtlastDependency/actual_out.txt
+- tests/compiler/AtlastDependency/expected_out.txt
+- tests/compiler/AtlastDependency/in.txt
 - tests/compiler/ComplexDataType/ComplexDataType.mfrp
 - tests/compiler/ComplexDataType/ComplexDataTypeMain.c
 - tests/compiler/ComplexDataType/Rakefile
@@ -159,8 +165,21 @@ files:
 - tests/compiler/LCDPositioner/graph.dot
 - tests/compiler/LCDPositioner/graph.png
 - tests/compiler/LCDPositioner/in.txt
+- tests/compiler/NestedMatch/NestedMatch.mfrp
+- tests/compiler/NestedMatch/NestedMatchMain.c
+- tests/compiler/NestedMatch/Rakefile
+- tests/compiler/NestedMatch/actual_out.txt
+- tests/compiler/NestedMatch/expected_out.txt
+- tests/compiler/NestedMatch/in.txt
 - tests/compiler/Rakefile
 - tests/compiler/Rakefile.common
+- tests/compiler/SubModuleInit/Delay2.mfrp
+- tests/compiler/SubModuleInit/Rakefile
+- tests/compiler/SubModuleInit/SubModuleInit.mfrp
+- tests/compiler/SubModuleInit/SubModuleInitMain.c
+- tests/compiler/SubModuleInit/actual_out.txt
+- tests/compiler/SubModuleInit/expected_out.txt
+- tests/compiler/SubModuleInit/in.txt
 - tests/compiler/UseData/Rakefile
 - tests/compiler/UseData/UseData.mfrp
 - tests/compiler/UseData/UseDataMain.c
@@ -204,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: A compier of Emfrp, a FRP language for small embeded systems.