sxp 1.2.2 → 1.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/lib/sxp/reader/basic.rb +1 -1
  4. data/lib/sxp/reader/common_lisp.rb +18 -3
  5. metadata +10 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2eaff02d432cb19a6dae788a85da4a45d44a04f8c6f40c1a89dcef626772452f
4
- data.tar.gz: 7e94286788c0eaaf82652f397166d7f4bbafcb9acc9b192196a87e18188575e3
3
+ metadata.gz: e0def5550a64e4c23fadfa0255347b32d74e8d263116a9bc855d6ad8113f75a0
4
+ data.tar.gz: 837c79054b8cdd73faf80283dae018f8f10a8ec29665ab4742cce074e18a3d75
5
5
  SHA512:
6
- metadata.gz: b3273851f27be900a67b34281f62dcd9ce9b9e66977a2ee2ed59d156af15ee30ff185b563775cc90b20dec42976a618c57965f2a46a6c22a0a1eb312b78e1877
7
- data.tar.gz: f4009530afca4965902431880d0d967aacf1cb31af08e098c5bfe86ea0504b8b23299cd9fc476d150843e54b1be36ddc9a942911e8c211bdc465f434580b0012
6
+ metadata.gz: 0fbc0c79aaef7f33b2cedb1bfe56293477a22838897dce9e17bf7f8fa4db1cd15e234109b58e473d711b5288eb0be340d34c6867d13ed183e51f46a1f4a5c06a
7
+ data.tar.gz: c68c05c3fb3e37327c686416867d3bd73dc054867f016dfde6e57e70a1e8e1645e253fa9e8b32ffbc4ce6baabf26b84b559307d63c7cb457b5cfc9a210d71498
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.2
1
+ 1.2.4
data/lib/sxp/reader/basic.rb CHANGED
@@ -26,7 +26,7 @@ module SXP; class Reader
26
26
  case buffer = read_literal
27
27
  when '.' then buffer.to_sym
28
28
  when RATIONAL then Rational($1.to_i, $2.to_i)
29
- when DECIMAL then Float(buffer) # FIXME?
29
+ when DECIMAL then Float(buffer.end_with?('.') ? "#{buffer}0" : buffer)
30
30
  when INTEGER then Integer(buffer)
31
31
  else buffer.to_sym
32
32
  end
data/lib/sxp/reader/common_lisp.rb CHANGED
@@ -7,7 +7,7 @@ module SXP; class Reader
7
7
  #
8
8
  # @see https:/www.cs.cmu.edu/Groups/AI/html/cltl/clm/node14.html
9
9
  class CommonLisp < Basic
10
- OPTIONS = {nil: nil, t: true, quote: :quote, function: :function}
10
+ OPTIONS = {nil: false, t: true, quote: :quote, function: :function}
11
11
 
12
12
  DECIMAL = /^[+-]?(\d*)?\.\d*$/
13
13
  INTEGER_BASE_2 = /^[+-]?[01]+$/
@@ -35,7 +35,7 @@ module SXP; class Reader
35
35
  #
36
36
  # @param [IO, StringIO, String] input
37
37
  # @param [Hash{Symbol => Object}] options
38
- # @option options [Object] :nil (nil)
38
+ # @option options [Object] :nil (false)
39
39
  # @option options [Object] :t (true)
40
40
  # @option options [Object] :quote (:quote)
41
41
  # @option options [Object] :function (:function)
@@ -69,6 +69,21 @@ module SXP; class Reader
69
69
  end
70
70
  end
71
71
 
72
+ ##
73
+ # Based on Basic#read_atom, but adds 't' and 'nil' atoms.
74
+ # @return [Object]
75
+ def read_atom
76
+ case buffer = read_literal
77
+ when '.' then buffer.to_sym
78
+ when RATIONAL then Rational($1.to_i, $2.to_i)
79
+ when DECIMAL then Float(buffer) # FIXME?
80
+ when INTEGER then Integer(buffer)
81
+ when /^t$/i then true
82
+ when /^nil$/i then nil
83
+ else buffer.to_sym
84
+ end
85
+ end
86
+
72
87
  ##
73
88
  # @return [Symbol]
74
89
  def read_symbol(delimiter = nil)
@@ -77,7 +92,7 @@ module SXP; class Reader
77
92
  until delimiter === peek_char
78
93
  buffer <<
79
94
  case char = read_char
80
- when ?\\ then read_character
95
+ when ?\\ then read_char
81
96
  else char
82
97
  end
83
98
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sxp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2022-03-14 00:00:00.000000000 Z
12
+ date: 2023-05-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rdf
@@ -29,16 +29,16 @@ dependencies:
29
29
  name: matrix
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ">="
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '0'
34
+ version: '0.4'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ">="
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '0'
41
+ version: '0.4'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: amazing_print
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '3.10'
62
+ version: '3.12'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '3.10'
69
+ version: '3.12'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: yard
72
72
  requirement: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@ metadata:
124
124
  homepage_uri: https://github.com/dryruby/sxp
125
125
  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
126
126
  source_code_uri: https://github.com/dryruby/sxp
127
+ rubygems_mfa_required: 'true'
127
128
  post_install_message:
128
129
  rdoc_options: []
129
130
  require_paths:
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
140
  - !ruby/object:Gem::Version
140
141
  version: '0'
141
142
  requirements: []
142
- rubygems_version: 3.3.3
143
+ rubygems_version: 3.4.6
143
144
  signing_key:
144
145
  specification_version: 4
145
146
  summary: A pure-Ruby implementation of a universal S-expression parser.