finitio 0.7.0.pre.rc3 → 0.7.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bceafae3cf07b42eeafcd42847e29426ee8b9694
-  data.tar.gz: 947dd8fccf1bc29439a8948e18850f7e53f502b9
+  metadata.gz: e41db73ab84b38134f0f19c0340c0863ff2d134b
+  data.tar.gz: db5f29aa5ce74764ffa96124d5982b3734491790
 SHA512:
-  metadata.gz: 541944fb0f9e729886145707c46f88c70677a9ea63272021e9fa67d083b867a2ec35c24e1035763c04c21ab8006cccd111717c144c40ed297c06e0b8b6b7ec4a
-  data.tar.gz: 297ce451632080bd09e888c2e16fe1991722485375348ce08b06225c2a15b3f34220a805e05f22fcb623e37aba26e982629c89709b1c643ee8af13f8f63a733e
+  metadata.gz: 7a48bf413dab63621f2c246fe4997ea8b0a1b9a04e3ac66ff14db4e697156cc20a56bd4ec2fee9493facbdc9466433d1f96d0e7d3a47162126402bf38e39ac88
+  data.tar.gz: 9def829a4ad8936700eba39ae1aaefebd0526def79a9c289cbfc06c2abf0b2be54771826b97c739d2cda39455223e0b60dd4f6d7e45a96bc39884338bd2312e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    finitio (0.7.0.pre.rc3)
+    finitio (0.7.0.pre.rc4)
       citrus (>= 2.4, < 4.0)
 
 GEM

data/lib/finitio.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'time'
 require 'pathname'
+require 'thread'
 
 module Finitio
 
@@ -9,6 +10,7 @@ module Finitio
   require_relative "finitio/support"
   require_relative 'finitio/type'
   require_relative 'finitio/system'
+  require_relative "finitio/syntax"
 
   IDENTITY = ->(object){ object }
 
@@ -18,25 +20,53 @@ module Finitio
     File.expand_path('../finitio/stdlib', __FILE__)
   ]
 
+  MEMOIZED_SYSTEMS = {}
+
+  MEMOIZATION_SEMAPHORE = Mutex.new
+
   def stdlib_path(path)
     STDLIB_PATHS << path
   end
 
   def parse(source)
-    require "finitio/syntax"
     Syntax.parse(source)
   end
 
   def system(source)
-    require "finitio/syntax"
-    Syntax.compile(source)
+    MEMOIZATION_SEMAPHORE.synchronize {
+      _system(source)
+    }
+  end
+
+  def _system(source)
+    if expanded = is_stdlib_source?(source)
+      MEMOIZED_SYSTEMS[expanded] ||= Syntax.compile(source)
+    else
+      Syntax.compile(source)
+    end
+  end
+  private :_system
+
+  def clear_saved_systems!
+    MEMOIZATION_SEMAPHORE.synchronize {
+      MEMOIZED_SYSTEMS.clear
+    }
   end
 
   def ast(source)
-    require "finitio/syntax"
     Syntax.ast(source)
   end
 
+  def is_stdlib_source?(source)
+    return false unless source.respond_to?(:to_path)
+    stdlib = STDLIB_PATHS.any?{|stdlib|
+      a_list = File.expand_path(source.to_path).split('/')
+      b_list = File.expand_path(stdlib).split('/')
+      a_list[0..b_list.size-1] == b_list
+    }
+    stdlib ? File.expand_path(source.to_path) : nil
+  end
+
   extend self
 
   DEFAULT_SYSTEM = system(File.read(

data/lib/finitio/syntax/import.rb

@@ -7,7 +7,7 @@ module Finitio
 
       def compile(system)
         file = system.resolve_url(import_url)
-        imported = Finitio.system(file)
+        imported = Finitio.send(:_system, file)
         system.add_import(imported)
         system
       end

data/lib/finitio/system.rb

@@ -104,8 +104,10 @@ module Finitio
           next unless found = i.get_type(t.name)
           if found == t
             STDERR.puts "WARN: duplicate type def `#{t.name}`"
+            break
           else
             STDERR.puts "NOTICE: Type erasure `#{t.name}`"
+            break
           end
         end
       end

data/lib/finitio/version.rb

@@ -3,7 +3,7 @@ module Finitio
 
     MAJOR = 0
     MINOR = 7
-    TINY  = "0-rc3"
+    TINY  = "0-rc4"
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/finitio/test_stdlib_memoization.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+describe Finitio, "stdlib memoization" do
+
+  describe "is_stdlib_source?" do
+
+    it 'says false when source code' do
+      expect(Finitio.is_stdlib_source?(".String")).to be_falsy
+    end
+
+    it 'says false when a source file' do
+      expect(Finitio.is_stdlib_source?(Path.dir/"system.fio")).to be_falsy
+    end
+
+    it 'says true when a stdlib file' do
+      source = Path.dir.parent.parent/"lib/finitio/stdlib/finitio/data.fio"
+      expect(source).to be_file
+      expect(Finitio.is_stdlib_source?(source)).to be_truthy
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.rc3
+  version: 0.7.0.pre.rc4
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -152,6 +152,7 @@ files:
 - spec/finitio/system.fio
 - spec/finitio/test_ast.rb
 - spec/finitio/test_parse.rb
+- spec/finitio/test_stdlib_memoization.rb
 - spec/finitio/test_system.rb
 - spec/finitio/with-duplicates.fio
 - spec/heading/test_allow_extra.rb
@@ -366,6 +367,7 @@ test_files:
 - spec/finitio/system.fio
 - spec/finitio/test_system.rb
 - spec/finitio/test_parse.rb
+- spec/finitio/test_stdlib_memoization.rb
 - spec/system/test_initialize.rb
 - spec/system/test_get_type.rb
 - spec/system/test_fetch.rb