emfrp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d962a4e429994cc567a8b55d5f2af0e0740315
-  data.tar.gz: aedf5fea2452340e9eed146c46df4e13499eeeb5
+  metadata.gz: 61e335460dfc357d7b07dcffb638789a93033478
+  data.tar.gz: a8c3b82e4f36de3062ed97f3535cb6a1c5b32cbc
 SHA512:
-  metadata.gz: dccd435654a7e1c861d50b7940e84e9adbe643d2807834b316b28deda96198c356450f6b0233ed8ed696fd8e44861f135d78beb1cb694afb4890f89161e58c45
-  data.tar.gz: d6e567bea262b2e6989cd5adc549ce017b73e02d2f53ab31dae6306a94ea9c82f632a3787af9614505a489630acd47b046c43ff33ba4af5fb95abe2bdf6a4bed
+  metadata.gz: 106c4bdd43fd5fea6f6f8fc800e25ce1f8b50c34bcec336a0a006bb3517d6c55d94152a530e81e03deb66095927622e1523b5235f6e059c9d5567434d3ba08e0
+  data.tar.gz: 8791d44c0b27d9097f583b803c39ff7f54abc2334ed3227ed07b17fb79eb1ba6a653d9d770d2f455de9ad0c5c260b51cb02a52ef8cfab1b8ed3106b908308912

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

@@ -287,7 +287,7 @@ module Emfrp
 
   class InputDef
     def init_func_gen(ct)
-      ct.define_func(tref(self), init_func_name(ct), []) do |x|
+      ct.define_func(ct.tref(self), init_func_name(ct), []) do |x|
         x << "return #{self[:init_exp].codegen(ct, x)};"
       end
     end

data/lib/emfrp/compile/graphviz/graphviz.rb

@@ -33,9 +33,9 @@ module Emfrp
         node[:params].each do |n|
           ch_name = n[:name][:desc]
           if n[:last]
-            edge_stmts << "#{ch_name} -> #{name} [style = dashed];"
+            edge_stmts << "#{escape_name(ch_name)} -> #{escape_name(name)} [style = dashed];"
           else
-            edge_stmts << "#{ch_name} -> #{name};"
+            edge_stmts << "#{escape_name(ch_name)} -> #{escape_name(name)};"
           end
           ch_node = top[:dict][:node_space][ch_name].get
           traverse(top, ch_node, node_stmts, edge_stmts, visited)
@@ -43,7 +43,11 @@ module Emfrp
       when InputDef
         node_attrs << "shape = \"invhouse\""
       end
-      node_stmts << "#{name} [#{node_attrs.join(", ")}];"
+      node_stmts << "#{escape_name(name)} [#{node_attrs.join(", ")}];"
+    end
+
+    def escape_name(name)
+      CodegenContext.new(nil).escape_name(name)
     end
   end
 end

data/lib/emfrp/version.rb

@@ -1,3 +1,3 @@
 module Emfrp
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/tests/compiler/UseSubModule/graph.dot

@@ -0,0 +1,41 @@
+digraph UseSubModule {
+  x [label = "x : Int", shape = "invhouse"];
+  i1_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "i1#UseSubModule(a1,b1) : Int"];
+  x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "x#SubModule(a)#UseSubModule(a1,b1) : Int"];
+  y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "y#SubModule(a)#UseSubModule(a1,b1) : Int"];
+  a_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "a#UseSubModule(a1,b1) : Int"];
+  i2_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "i2#UseSubModule(a1,b1) : Int"];
+  x_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "x#UseSubModule(a1,b1) : Int"];
+  a1 [label = "a1 : Int", style = filled, fillcolor = "#e4e4e4"];
+  y_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [label = "y#UseSubModule(a1,b1) : Int"];
+  b1 [label = "b1 : Int", style = filled, fillcolor = "#e4e4e4"];
+  i1_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "i1#UseSubModule(a2,b2) : Int"];
+  x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "x#SubModule(a)#UseSubModule(a2,b2) : Int"];
+  y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "y#SubModule(a)#UseSubModule(a2,b2) : Int"];
+  a_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "a#UseSubModule(a2,b2) : Int"];
+  i2_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "i2#UseSubModule(a2,b2) : Int"];
+  x_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "x#UseSubModule(a2,b2) : Int"];
+  a2 [label = "a2 : Int", style = filled, fillcolor = "#e4e4e4"];
+  y_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [label = "y#UseSubModule(a2,b2) : Int"];
+  b2 [label = "b2 : Int", style = filled, fillcolor = "#e4e4e4"];
+  x_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> a1;
+  a_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> x_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> a_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  i1_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  x -> i1_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  i2_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> x_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  y_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> b1;
+  y_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> y_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ [style = dashed];
+  i2_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_ -> y_hash_UseSubModule_cpbegin_a1_comma_b1_cpend_;
+  x_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> a2;
+  a_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> x_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> a_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> y_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  i1_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> x_hash_SubModule_cpbegin_a_cpend__hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  x -> i1_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  i2_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> x_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+  y_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> b2;
+  y_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> y_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ [style = dashed];
+  i2_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_ -> y_hash_UseSubModule_cpbegin_a2_comma_b2_cpend_;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emfrp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -160,6 +160,8 @@ files:
 - tests/compiler/UseSubModule/UseSubModuleMain.c
 - tests/compiler/UseSubModule/actual_out.txt
 - tests/compiler/UseSubModule/expected_out.txt
+- tests/compiler/UseSubModule/graph.dot
+- tests/compiler/UseSubModule/graph.png
 - tests/compiler/UseSubModule/in.txt
 - tests/core/FromAnnotation.mfrp
 - tests/core/Last.mfrp