rtext 0.9.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e14d27070197af864d0b24a38f9d41cb4115c3
-  data.tar.gz: '0984afc951a23e67def08c00be574c3b9b92647d'
+  metadata.gz: fb4a1d69fdbd2a206533e794037b5ef402fe0211
+  data.tar.gz: 605e53ea50a4af9adc9fa9dfef056d9f33700066
 SHA512:
-  metadata.gz: a8ad0fbe93721f12c413f839d4448cc606e50c0ad001272d35f47f67c57fe54b404472a7164f2abee3dec526d9dbd33c60bc16ea80a2b68fc0b7c486ce1ac43f
-  data.tar.gz: bc569b6b09999d14abf10f05c606b738880ffe6f480c520982b052ef3a39124548932e9dfd7901bc92b6f99e6495d6ddf3f87e88a04a97e4f52ec405caeb5b67
+  metadata.gz: 8dcfad15c3d4de23ec459bb2ed7cb78791135a451f3968f43050cc588d23691139f5e5569cd7b9e9ee5eb96f5a676d1ae31143d5d62597fba448441c0e25d4a1
+  data.tar.gz: 3ae19eeb2b28ad8bd1e1f1f2399b60b45bf6f6c73305ae0ef426b672d774cf98bcc73417902c6cb3d1dc6d8cfe08c37f4a78acea0356466c4cf0e06f10ef3be2

data/CHANGELOG

@@ -114,3 +114,11 @@
 =0.9.4
 
 * Fixed issue with unquoted multiline strings
+
+=0.10.0
+
+* Switch to Ruby 2.7
+
+=0.11.0
+
+* Add support for Ruby up to 3.2

data/Project.yaml

@@ -1,5 +1,5 @@
 name: rtext
-version: 0.9.4
+version: 0.11.0
 git: https://github.com/mthiede/rtext.git
 summary: Ruby Textual Modelling
 email: martin dot thiede at gmx de
@@ -8,8 +8,8 @@ description: RText can be used to derive textual languages from an RGen metamode
 authors: [Martin Thiede]
 dependencies:
   http://rubygems.org:
-    - {name: rgen,     version: '~> 0.8.0'}
-    - {name: filelock, version: '~> 1.1.0'}
+    - {name: rgen,     version: ['>= 0.10.0', '< 0.11']}
+    - {name: filelock, version: ['>= 1.1.1', '< 1.2']}
 rdoc_options: [--main, README.rdoc, -x, test]
 extra_rdoc_files: [README.rdoc, CHANGELOG, MIT-LICENSE, RText_Users_Guide, RText_Protocol]
 encrypt_sources: false

data/lib/rtext/frontend/connector.rb

@@ -120,7 +120,12 @@ def ensure_process_cleanup(process_id, out_file, timeout)
     ensure
       unless process_id.nil?
         begin
-          Process.kill('QUIT', process_id)
+          begin
+            Process.kill('QUIT', process_id)
+          rescue ArgumentError
+            # SIGQUIT not supported in Ruby 2.7 on Windows
+            Process.kill('KILL', process_id)
+          end
         rescue Errno::ESRCH => _
         end
       end

data/lib/rtext/instantiator.rb

@@ -112,18 +112,18 @@ class Instantiator
     element = clazz.new
     @env << element if @env
     @root_elements << element if is_root
-    unlabled_args = @lang.unlabled_arguments(clazz.ecore).name
+    unlabeled_args = @lang.unlabled_arguments(clazz.ecore).name
     di_index = 0
     defined_args = {}
     arg_list.each do |a|
       if is_labeled(a) 
         set_argument(element, a[0].value, a[1], defined_args, command.line)
       else
-        if di_index < unlabled_args.size 
-          set_argument(element, unlabled_args[di_index], a, defined_args, command.line)
+        if di_index < unlabeled_args.size
+          set_argument(element, unlabeled_args[di_index], a, defined_args, command.line)
           di_index += 1
         elsif a != nil
-          problem("Unexpected unlabled argument, #{unlabled_args.size} unlabled arguments expected", command.line)
+          problem("Unexpected unlabeled argument, #{unlabeled_args.size} unlabeled arguments expected", command.line)
         end
       end
     end
@@ -249,9 +249,9 @@ class Instantiator
         begin
           v_value = v.value
           feature_instance_class = feature.eType.instanceClass
-          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Fixnum))
+          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Integer))
             element.setOrAddGeneric(feature.name, v_value.to_s)
-          elsif feature_instance_class == Float && v_value.is_a?(Fixnum)
+          elsif feature_instance_class == Float && v_value.is_a?(Integer)
             element.setOrAddGeneric(feature.name, v_value.to_f)
           else
             element.setOrAddGeneric(feature.name, v_value)

data/lib/rtext/tokenizer.rb

@@ -49,7 +49,7 @@ module Tokenizer
             if val.size <= 16
               val = val.to_f
             else
-              val = BigDecimal.new(val)
+              val = BigDecimal(val)
             end
             result << Token.new(:float, val, idx, col, col+$&.size-1)
             col += $&.size

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: filelock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 description: RText can be used to derive textual languages from an RGen metamodel
   with very little effort.
 email: