expressir 1.0.0 → 1.2.1

data/ext/express-parser/extconf.rb

@@ -21,7 +21,7 @@ src_paths = [
 if cross_build
   rice_subdir = "rice-embed"
   rice_root = Gem.loaded_specs["rice"].full_gem_path
-  rice_src = File.join(rice_root, "rice")
+  rice_src = File.join(rice_root, "include", "rice")
   rice_embed = File.join(__dir__, rice_subdir)
   unless File.exists?(rice_embed)
     FileUtils.mkdir_p(rice_embed)
@@ -30,7 +30,7 @@ if cross_build
     File.delete(*Dir.glob("#{rice_embed}/**/Makefile"))
   end
 
-  src_paths.push("#{rice_subdir}/rice", "#{rice_subdir}/rice/detail")
+  src_paths.push("#{rice_subdir}/include")
 
   $INCFLAGS << " -I#{__dir__}/#{rice_subdir}"
 
@@ -39,6 +39,8 @@ if cross_build
     $CXXFLAGS << " -O3 -Wa,-mbig-obj"
     # workaround for LoadError: 127: The specified procedure could not be found.
     $DLDFLAGS << " -static -static-libgcc -static-libstdc++"
+  elsif RbConfig::CONFIG['target_os'] =~ /darwin/
+    $CXXFLAGS << " -mmacosx-version-min=10.14 -Wno-register"
   end
 else
   require 'mkmf-rice'
@@ -46,7 +48,7 @@ else
   dir_config(extension_name)
 end
 
-$CPPFLAGS << " -std=c++14 -DANTLR4CPP_STATIC -DHAVE_CXX11"
+$CPPFLAGS << " -std=c++17 -DANTLR4CPP_STATIC -DHAVE_CXX11"
 $INCFLAGS << " -I#{__dir__}/#{antlr4_src}"
 $srcs = []
 

data/lib/expressir/express/cache.rb

@@ -5,28 +5,34 @@ require 'expressir/model'
 module Expressir
   module Express
     class Cache
-      def self.to_file(file, content, options = {})
-        root_path = options[:root_path]
-        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
-
+      # Save Express model into a cache file
+      # @param file [String] cache file path
+      # @param content [Model::ModelElement] Express model
+      # @param root_path [String] Express repository root path, to be stripped from Express file paths to create a portable cache file
+      # @param test_overwrite_version [String] don't use, only for tests
+      # @return [nil]
+      def self.to_file(file, content, root_path: nil, test_overwrite_version: nil)
         version = test_overwrite_version || VERSION
 
-        cache = Model::Cache.new({
+        cache = Model::Cache.new(
           version: version,
           content: content
-        })
+        )
 
         hash = cache.to_hash(root_path: root_path)
         yaml = YAML.dump(hash)
         yaml_compressed = Zlib::Deflate.deflate(yaml)
 
         File.binwrite(file, yaml_compressed)
+        nil
       end
 
-      def self.from_file(file, options = {})
-        root_path = options[:root_path]
-        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
-
+      # Load Express model from a cache file
+      # @param file [String] cache file path
+      # @param root_path [String] Express repository root path, to be prepended to Express file paths if loading a portable cache file
+      # @param test_overwrite_version [String] don't use, only for tests
+      # @return [Model::ModelElement] Express model
+      def self.from_file(file, root_path: nil, test_overwrite_version: nil)
         version = test_overwrite_version || VERSION
 
         yaml_compressed = File.binread(file)