emfrp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b22236346a774cffb9cf18b119085b0177a0aab6
-  data.tar.gz: f0aeb3ec0dd857f2ba08678f0a34b8398bd529a9
+SHA256:
+  metadata.gz: 990c1ccf97f667ebb79f79f1f0e480ebcb40fe7ca379e4ea0ddecf4907f4c709
+  data.tar.gz: 45914615a642a6aa2fe41dff756c8150acf6622d758cfb482c29ec6eeed8fe73
 SHA512:
-  metadata.gz: bbbbb76bac2428193c34ce526269dfa8d524116de18f419a6d1536809eb655449e3f7c186511ea99bad08fca175a7c501092bb05381a6e4c7b3a5812b3534610
-  data.tar.gz: 29135f70e0b9607465857decad838a735ef00dd93db938a1b5b98dc17b53af31eeaaff244be759578ad06dc9704373bcf435c374c5abea53f00dec8e9bcefeec
+  metadata.gz: bc9f730f0f723f718eb5bc6909a48a7417c1a39641faa5e6738e9192f9fc45387eddb7f002c8eabf9128a3d1c1848915b5582e578086ad19d6d207b8634343aa
+  data.tar.gz: 7f5a4ad5655cbb96faed550dff8add18e1aa5a09d7157721da8dd192e0dca09ab64275898a722451d7bdd495a26a25418406cb53b8505e0fac3d16968aac0b95

data/.github/workflows/test.yml

@@ -0,0 +1,20 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+      - name: Build and test with Rake
+        run: |
+          bundle install --jobs 4 --retry 3
+          cd tests && bundle exec rake
+

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in emfrp.gemspec
 gemspec
-colorize
-parser_combinator

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

@@ -43,7 +43,7 @@ module Emfrp
           i >= ref_pos_last(x)
         end
         crefs.reject! do |x|
-          i >= ref_pos_current(x)
+          ref_pos_last(x) == -1 and i >= ref_pos_current(x)
         end
       end
       return max_amount

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

@@ -146,6 +146,7 @@ module Emfrp
           while_stmts << "if (#{mn} < Counter) { x = #{memory_name(ct)} + #{memory_counter_name(ct)}; break; }"
           s << "#{ref_name(ct)} x;"
           s << ct.make_block("while (1) {", while_stmts, "}")
+          s << "x->mark = 0;"
           s << "x->tvalue_id = #{i};" if self[:tvalues].length > 1
           tvalue[:params].each_with_index do |param, i|
             s << "x->value.#{tvalue.struct_name(ct)}.member#{i} = member#{i};"
@@ -159,7 +160,7 @@ module Emfrp
       return if enum?(ct)
       params = [[ref_name(ct), "x"], ["int", "mark"]]
       ct.define_func("void", marker_func_name(ct), params) do |x|
-        x << "x->mark = mark;" unless self[:static]
+        x << "if (mark > x->mark) { x->mark = mark; }" unless self[:static]
         accessor = self[:static] ? "." : "->"
         cases = []
         self[:tvalues].each_with_index do |tvalue, i|

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

@@ -72,6 +72,8 @@ module Emfrp
         end
         if i == 0
           stmts << ct.make_block("if (#{cond_exp}) {", then_stmts, "}")
+        elsif i == self[:cases].length - 1
+          stmts << ct.make_block("else {", then_stmts, "}")
         else
           stmts << ct.make_block("else if (#{cond_exp}) {", then_stmts, "}")
         end

data/lib/emfrp/version.rb

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

data/tests/compiler/GCLifeTime/GCLifeTime.mfrp

@@ -0,0 +1,13 @@
+module GCLifeTime
+in a : Int
+out x
+use Std
+
+type Wrap = Wrap(Int)
+
+node init[Wrap(0)] wrap = Wrap(a)
+node ref = wrap
+node unwrap = ref of Wrap(val) -> val
+node rewrap = Wrap(unwrap)
+
+node x = (wrap@last, rewrap) of (Wrap(p), Wrap(q)) -> p + q

data/tests/compiler/GCLifeTime/GCLifeTimeMain.c

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

data/tests/compiler/GCLifeTime/Rakefile

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

data/tests/compiler/GCLifeTime/actual_out.txt

@@ -0,0 +1,10 @@
+1
+3
+5
+7
+9
+11
+13
+15
+17
+19

data/tests/compiler/GCLifeTime/expected_out.txt

@@ -0,0 +1,10 @@
+1
+3
+5
+7
+9
+11
+13
+15
+17
+19

data/tests/compiler/GCLifeTime/in.txt

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emfrp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -75,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -151,6 +152,12 @@ files:
 - tests/compiler/ComplexDataType/expected_out.txt
 - tests/compiler/ComplexDataType/graph.png
 - tests/compiler/ComplexDataType/in.txt
+- tests/compiler/GCLifeTime/GCLifeTime.mfrp
+- tests/compiler/GCLifeTime/GCLifeTimeMain.c
+- tests/compiler/GCLifeTime/Rakefile
+- tests/compiler/GCLifeTime/actual_out.txt
+- tests/compiler/GCLifeTime/expected_out.txt
+- tests/compiler/GCLifeTime/in.txt
 - tests/compiler/LCDClock/LCDClock.mfrp
 - tests/compiler/LCDClock/LCDClockMain.c
 - tests/compiler/LCDClock/Rakefile
@@ -222,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A compier of Emfrp, a FRP language for small embeded systems.