rtext 0.10.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +5 -1
- data/Project.yaml +2 -2
- data/lib/rtext/frontend/connector.rb +6 -1
- data/lib/rtext/instantiator.rb +6 -6
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fb4a1d69fdbd2a206533e794037b5ef402fe0211
|
4
|
+
data.tar.gz: 605e53ea50a4af9adc9fa9dfef056d9f33700066
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8dcfad15c3d4de23ec459bb2ed7cb78791135a451f3968f43050cc588d23691139f5e5569cd7b9e9ee5eb96f5a676d1ae31143d5d62597fba448441c0e25d4a1
|
7
|
+
data.tar.gz: 3ae19eeb2b28ad8bd1e1f1f2399b60b45bf6f6c73305ae0ef426b672d774cf98bcc73417902c6cb3d1dc6d8cfe08c37f4a78acea0356466c4cf0e06f10ef3be2
|
data/CHANGELOG
CHANGED
data/Project.yaml
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
name: rtext
|
2
|
-
version: 0.
|
2
|
+
version: 0.11.0
|
3
3
|
git: https://github.com/mthiede/rtext.git
|
4
4
|
summary: Ruby Textual Modelling
|
5
5
|
email: martin dot thiede at gmx de
|
@@ -8,7 +8,7 @@ description: RText can be used to derive textual languages from an RGen metamode
|
|
8
8
|
authors: [Martin Thiede]
|
9
9
|
dependencies:
|
10
10
|
http://rubygems.org:
|
11
|
-
- {name: rgen, version: ['>= 0.
|
11
|
+
- {name: rgen, version: ['>= 0.10.0', '< 0.11']}
|
12
12
|
- {name: filelock, version: ['>= 1.1.1', '< 1.2']}
|
13
13
|
rdoc_options: [--main, README.rdoc, -x, test]
|
14
14
|
extra_rdoc_files: [README.rdoc, CHANGELOG, MIT-LICENSE, RText_Users_Guide, RText_Protocol]
|
@@ -120,7 +120,12 @@ def ensure_process_cleanup(process_id, out_file, timeout)
|
|
120
120
|
ensure
|
121
121
|
unless process_id.nil?
|
122
122
|
begin
|
123
|
-
|
123
|
+
begin
|
124
|
+
Process.kill('QUIT', process_id)
|
125
|
+
rescue ArgumentError
|
126
|
+
# SIGQUIT not supported in Ruby 2.7 on Windows
|
127
|
+
Process.kill('KILL', process_id)
|
128
|
+
end
|
124
129
|
rescue Errno::ESRCH => _
|
125
130
|
end
|
126
131
|
end
|
data/lib/rtext/instantiator.rb
CHANGED
@@ -112,18 +112,18 @@ class Instantiator
|
|
112
112
|
element = clazz.new
|
113
113
|
@env << element if @env
|
114
114
|
@root_elements << element if is_root
|
115
|
-
|
115
|
+
unlabeled_args = @lang.unlabled_arguments(clazz.ecore).name
|
116
116
|
di_index = 0
|
117
117
|
defined_args = {}
|
118
118
|
arg_list.each do |a|
|
119
119
|
if is_labeled(a)
|
120
120
|
set_argument(element, a[0].value, a[1], defined_args, command.line)
|
121
121
|
else
|
122
|
-
if di_index <
|
123
|
-
set_argument(element,
|
122
|
+
if di_index < unlabeled_args.size
|
123
|
+
set_argument(element, unlabeled_args[di_index], a, defined_args, command.line)
|
124
124
|
di_index += 1
|
125
125
|
elsif a != nil
|
126
|
-
problem("Unexpected
|
126
|
+
problem("Unexpected unlabeled argument, #{unlabeled_args.size} unlabeled arguments expected", command.line)
|
127
127
|
end
|
128
128
|
end
|
129
129
|
end
|
@@ -249,9 +249,9 @@ class Instantiator
|
|
249
249
|
begin
|
250
250
|
v_value = v.value
|
251
251
|
feature_instance_class = feature.eType.instanceClass
|
252
|
-
if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(
|
252
|
+
if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Integer))
|
253
253
|
element.setOrAddGeneric(feature.name, v_value.to_s)
|
254
|
-
elsif feature_instance_class == Float && v_value.is_a?(
|
254
|
+
elsif feature_instance_class == Float && v_value.is_a?(Integer)
|
255
255
|
element.setOrAddGeneric(feature.name, v_value.to_f)
|
256
256
|
else
|
257
257
|
element.setOrAddGeneric(feature.name, v_value)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rtext
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Thiede
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-02-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rgen
|
@@ -16,20 +16,20 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.10.0
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: '0.
|
22
|
+
version: '0.11'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.
|
29
|
+
version: 0.10.0
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: '0.
|
32
|
+
version: '0.11'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: filelock
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|