emfrp 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739151824444ba84586ec87772d5cbb30bb2157c
-  data.tar.gz: 76b48e983b31abd5459cea456f68976af359fa0f
+  metadata.gz: 59d962a4e429994cc567a8b55d5f2af0e0740315
+  data.tar.gz: aedf5fea2452340e9eed146c46df4e13499eeeb5
 SHA512:
-  metadata.gz: 1b77eb4ab6596bcb41269a2b72fc22ad28b8137895c604ef013e0b7047677698b2bce41396c5b84eb0f535fdb5de6c9447773f4e66d953b21702a838c79e8de3
-  data.tar.gz: 73353f055c801bb8b2841651137b75112f1f96c94b93ffe2979c3e7a8a4eaadb36a7727ca3f65a494a3ab7c3fcbdd71b9af34a95a8025628a894751970dcff60
+  metadata.gz: dccd435654a7e1c861d50b7940e84e9adbe643d2807834b316b28deda96198c356450f6b0233ed8ed696fd8e44861f135d78beb1cb694afb4890f89161e58c45
+  data.tar.gz: d6e567bea262b2e6989cd5adc549ce017b73e02d2f53ab31dae6306a94ea9c82f632a3787af9614505a489630acd47b046c43ff33ba4af5fb95abe2bdf6a4bed

data/README.md

@@ -24,4 +24,5 @@ $ emfrp <src-file>
 
 ## Usage
 
-In prepraration...
+Here is a (temporary) easy introduction:
+https://github.com/sawaken/emfrp/wiki

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

@@ -19,7 +19,10 @@ module Emfrp
       "^" => "_caret_",
       "|" => "_vertial_",
       "-" => "_minus_",
-      "~" => "_tilde_"
+      "~" => "_tilde_",
+      "(" => "_cpbegin_",
+      ")" => "_cpend_",
+      "," => "_comma_"
     }
 
     def initialize(top)

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

@@ -75,9 +75,9 @@ module Emfrp
         @update = false
         @datas.each do |d|
           key = Link.new(d)
-          unless @top[:dict][:used_datas].find{|x| x == key}
+          unless @top[:dict][:sorted_datas].find{|x| x == key}
             monofy_exp(d[:exp])
-            @top[:dict][:used_datas] << key
+            @top[:dict][:sorted_datas] << key
           end
         end
         @ifuncs.each do |ifunc|

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

@@ -35,7 +35,7 @@ module Emfrp
       self[:dict][:used_pfuncs].each do |v|
         v.get.codegen(ct)
       end
-      self[:dict][:sorted_datas].each do |v|
+      self[:dict][:sorted_datas].reverse.each do |v|
         v.get.codegen(ct)
       end
       memory_gen(ct, ar)
@@ -87,7 +87,7 @@ module Emfrp
             "#{pn.node_var_name(ct)}[#{x[:last] ? "last_side" : "current_side"}]"
           end
           output_arg = "&#{node.node_var_name(ct)}[current_side]"
-          stmts << "#{node.node_func_name(ct)}(#{[args, *output_arg].join(", ")});"
+          stmts << "#{node.node_func_name(ct)}(#{[*args, output_arg].join(", ")});"
           t = ct.tdef(node)
           if t.is_a?(TypeDef) && !t.enum?(ct)
             mark_val = "Counter + #{ar.life_point(node)}"
@@ -265,15 +265,15 @@ module Emfrp
     end
 
     def init_func_name(ct)
-      "init_#{self[:name][:desc]}"
+      "init_#{ct.escape_name(self[:name][:desc])}"
     end
 
     def node_func_name(ct)
-      "node_#{self[:name][:desc]}"
+      "node_#{ct.escape_name(self[:name][:desc])}"
     end
 
     def node_var_name(ct)
-      "node_memory_#{self[:name][:desc]}"
+      "node_memory_#{ct.escape_name(self[:name][:desc])}"
     end
 
     def var_suffix(ct)
@@ -308,8 +308,8 @@ module Emfrp
   class DataDef
     def codegen(ct)
       t = ct.tref(self)
-      ct.define_global_var(t, var_name(ct))
-      ct.define_init_stmt(var_name(ct), "#{init_func_name(ct)}()")
+      ct.define_global_var(t, var_name(ct, self[:name][:desc]))
+      ct.define_init_stmt("#{var_name(ct, self[:name][:desc])} = #{init_func_name(ct)}();")
       ct.define_func(t, init_func_name(ct), []) do |x|
         x << "return #{self[:exp].codegen(ct, x)};"
       end

data/lib/emfrp/interpreter/command_manager.rb

@@ -159,9 +159,9 @@ module Emfrp
             end
           end
 
-          desc "Executing all commands embeded on source-files."
-          command "exec-embeded-commands" do
-            exec_embeded_commands()
+          desc "Executing all commands embedded on source-files."
+          command "exec-embedded-commands" do
+            exec_embedded_commands()
           end
 
           desc "Define documentation about function. (in preparation)"

data/lib/emfrp/interpreter/interpreter.rb

@@ -92,13 +92,13 @@ module Emfrp
     end
 
     #-> true-like(abnormal-term) / false-like(normal-term)
-    def exec_embeded_commands(only_on_main_path=false) #
+    def exec_embedded_commands(only_on_main_path=false) #
       @top[:commands].any? do |com|
         if !only_on_main_path || com[:file_name] == @file_loader.loaded_full_path(@main_path)
           unless process_repl_line(com[:command_str])
             nil
           else
-            puts "Embeded command on #{com[:file_name]}:#{com[:line_number]}\n"
+            puts "Embedded command on #{com[:file_name]}:#{com[:line_number]}\n"
             true
           end
         else

data/lib/emfrp/parser/newnode_convert.rb

@@ -0,0 +1,72 @@
+module Emfrp
+  module NewNodeConvert
+    extend self
+
+    def parse_module(mod_name, newnode, file_loader)
+      src_str, file_name = file_loader.load(newnode[:module_path].map{|x| x[:desc]})
+      top = Parser.parse_src(src_str, file_name, file_loader)
+      uniq_key = "#{mod_name}(#{newnode[:names].map{|x| x[:desc]}.join(",")})"
+      rename_nodes(top, uniq_key)
+      top[:inputs].zip(newnode[:args]).each do |input, arg_exp|
+        input[:name][:desc] << "##{uniq_key}"
+        top[:nodes] << NodeDef.new(
+          :name => input[:name],
+          :init_exp => nil,
+          :params => nil,
+          :type => nil,
+          :exp => arg_exp,
+        )
+      end
+      top[:inputs] = []
+      top[:outputs].zip(newnode[:names]).each do |output, newnode_name|
+        output[:name][:desc] << "##{uniq_key}"
+        top[:nodes] << NodeDef.new(
+          :name => newnode_name,
+          :init_exp => nil,
+          :params => nil,
+          :type => nil,
+          :exp => VarRef.new(:name => output[:name])
+        )
+      end
+      top[:outputs] = []
+      return top
+    end
+
+    def rename_nodes(top, uniq_key)
+      datas = Hash[top[:datas].map{|x| [x[:name][:desc], true]}]
+      top[:nodes].each do |n|
+        white_list = {}
+        n[:name][:desc] << "##{uniq_key}"
+        if n[:params]
+          n[:params].each do |pn|
+            white_list[pn[:as][:desc].clone] = true
+            pn[:name][:desc] << "##{uniq_key}"
+            pn[:as][:desc] << "##{uniq_key}"
+          end
+        end
+        rename_node_exp(n[:exp], datas, white_list, uniq_key, {})
+      end
+    end
+
+    def rename_node_exp(exp, datas, white_list, uniq_key, local_vars)
+      case exp
+      when VarRef
+        name = exp[:name][:desc]
+        if !local_vars[name] && (white_list[name] || !datas[name])
+          if name =~ /^(.*)@last$/
+            exp[:name][:desc] = "#{$1}##{uniq_key}@last"
+          else
+            exp[:name][:desc] << "##{uniq_key}"
+          end
+        end
+      when Case
+        vs = Hash[exp[:pattern].find_refs.map{|x| [x[:desc], true]}]
+        rename_node_exp(exp[:exp], datas, white_list, uniq_key, local_vars.merge(vs))
+      when Syntax
+        rename_node_exp(exp.values, datas, white_list, uniq_key, local_vars)
+      when Array
+        exp.each{|e| rename_node_exp(e, datas, white_list, uniq_key, local_vars)}
+      end
+    end
+  end
+end

data/lib/emfrp/parser/parser.rb

@@ -6,6 +6,7 @@ require 'emfrp/parser/expression'
 require 'emfrp/parser/misc'
 require 'emfrp/parser/operator'
 require 'emfrp/parser/parsing_error'
+require 'emfrp/parser/newnode_convert'
 
 module Emfrp
   class Parser < ParserCombinator::StringParser
@@ -22,10 +23,14 @@ module Emfrp
       when Fail
         raise ParsingError.new(src_str, file_name, res.status)
       when Ok
+        newnode_tops = res.parsed[:newnodes].map do |newnode|
+          NewNodeConvert.parse_module(res.parsed[:module_name][:desc], newnode, file_loader)
+        end
+        res.parsed[:newnodes] = []
         tops = res.parsed[:uses].map do |use_path|
           parse_input(use_path.map{|x| x[:desc]}, file_loader, material_file)
         end
-        return Top.new(*tops, res.parsed)
+        return Top.new(*tops, res.parsed, *newnode_tops)
       else
         raise "unexpected return of parser (bug)"
       end

data/lib/emfrp/parser/toplevel.rb

@@ -7,7 +7,18 @@ module Emfrp
     # --------------------
 
     parser :module_top_def do
-      (data_def ^ func_def ^ node_def ^ type_def ^ infix_def ^ primtype_def ^ primfunc_def ^ command_def).map do |x|
+      defs = [
+        data_def,
+        func_def,
+        node_def,
+        type_def,
+        infix_def,
+        primtype_def,
+        primfunc_def,
+        command_def,
+        newnode_def,
+      ]
+      defs.inject(&:^).map do |x|
         [x].flatten
       end
     end
@@ -65,6 +76,7 @@ module Emfrp
           when PrimTypeDef then :ptypes
           when PrimFuncDef then :pfuncs
           when CommandDef then :commands
+          when NewNodeDef then :newnodes
           end
           t[k] << d
         end
@@ -206,7 +218,7 @@ module Emfrp
           whole_name = x[:pattern][:ref]
         else
           whole_name = SSymbol.new(
-            :desc => "tmpNode" + x[:pattern].object_id.to_s,
+            :desc => "anonymous" + x[:pattern].object_id.to_s,
             :keyword => x[:pattern].deep_copy
           )
         end
@@ -333,6 +345,26 @@ module Emfrp
       end
     end
 
+    parser :newnode_def do
+      seq(
+        symbol("newnode").name(:keyword1),
+        many1(ws),
+        many1_fail(ident_begin_lower, comma_separator).name(:names),
+        many(ws),
+        char("="),
+        many(ws),
+        load_path.name(:module_path),
+        many(ws),
+        char("("),
+        many(ws),
+        many_fail(exp, comma_separator).name(:args),
+        many(ws),
+        symbol(")").name(:keyword2)
+      ).map do |x|
+        NewNodeDef.new(x.to_h)
+      end
+    end
+
     # Func associated
     # --------------------
 

data/lib/emfrp/syntax.rb

@@ -110,6 +110,7 @@ module Emfrp
       :itypes,
       :ifuncs,
       :commands,
+      :newnodes,
     ]
 
     def initialize(*tops)
@@ -152,6 +153,7 @@ module Emfrp
   Types = [
     :InputDef, :OutputDef, :DataDef, :FuncDef, :NodeDef, :TypeDef, :InfixDef,
     :PrimTypeDef, :PrimFuncDef, :CommandDef,
+    :NewNodeDef,
 
     :ParamDef, :Type, :TypeVar, :TValue, :TValueParam, :NodeConst, :ForeignExp,
 

data/lib/emfrp/version.rb

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

data/tests/Rakefile.common

@@ -6,7 +6,7 @@ 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_embeded_commands(true)
+  unless inter.exec_embedded_commands(true)
     puts " => ok".colorize(:green)
   else
     puts " => fail".colorize(:red)

data/tests/compiler/UseData/Rakefile

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

data/tests/compiler/UseData/UseData.mfrp

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

data/tests/compiler/UseData/UseDataMain.c

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

data/tests/compiler/UseData/actual_out.txt

@@ -0,0 +1,10 @@
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3

data/tests/compiler/UseData/expected_out.txt

@@ -0,0 +1,10 @@
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3

data/tests/compiler/UseSubModule/Rakefile

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

data/tests/compiler/UseSubModule/SubModule.mfrp

@@ -0,0 +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

data/tests/compiler/UseSubModule/SubModule2.mfrp

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

data/tests/compiler/UseSubModule/UseSubModule.mfrp

@@ -0,0 +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

data/tests/compiler/UseSubModule/UseSubModuleMain.c

@@ -0,0 +1,15 @@
+#include "UseSubModule.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void Input(int* x) {
+  if (scanf("%d", x) == EOF) {
+    exit(0);
+  }
+}
+void Output(int* a1, int* b1, int* a2, int* b2) {
+  printf("%d %d %d %d\n", *a1, *b1, *a2, *b2);
+}
+int main() {
+  ActivateUseSubModule();
+}

data/tests/compiler/UseSubModule/actual_out.txt

@@ -0,0 +1,2 @@
+0 2 3 3
+2 4 6 6

data/tests/compiler/UseSubModule/expected_out.txt

@@ -0,0 +1,2 @@
+0 2 3 3
+2 4 6 6

data/tests/compiler/UseSubModule/in.txt

@@ -0,0 +1,2 @@
+0
+1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emfrp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -111,6 +111,7 @@ files:
 - lib/emfrp/interpreter/interpreter.rb
 - lib/emfrp/parser/expression.rb
 - lib/emfrp/parser/misc.rb
+- lib/emfrp/parser/newnode_convert.rb
 - lib/emfrp/parser/operator.rb
 - lib/emfrp/parser/parser.rb
 - lib/emfrp/parser/parsing_error.rb
@@ -146,6 +147,20 @@ files:
 - tests/compiler/LCDPositioner/in.txt
 - tests/compiler/Rakefile
 - tests/compiler/Rakefile.common
+- tests/compiler/UseData/Rakefile
+- tests/compiler/UseData/UseData.mfrp
+- tests/compiler/UseData/UseDataMain.c
+- tests/compiler/UseData/actual_out.txt
+- tests/compiler/UseData/expected_out.txt
+- tests/compiler/UseData/in.txt
+- tests/compiler/UseSubModule/Rakefile
+- tests/compiler/UseSubModule/SubModule.mfrp
+- tests/compiler/UseSubModule/SubModule2.mfrp
+- tests/compiler/UseSubModule/UseSubModule.mfrp
+- tests/compiler/UseSubModule/UseSubModuleMain.c
+- tests/compiler/UseSubModule/actual_out.txt
+- tests/compiler/UseSubModule/expected_out.txt
+- tests/compiler/UseSubModule/in.txt
 - tests/core/FromAnnotation.mfrp
 - tests/core/Last.mfrp
 - tests/core/Rakefile