expressir 2.4.48-aarch64-linux → 2.4.50-aarch64-linux

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.
@@ -247,7 +247,13 @@ module Expressir
247
247
  (generalRef >> qualifier.repeat.as(:qualifier) >> op_decl >> expression >> op_delim).as(:assignmentStmt)
248
248
  end
249
249
  rule(:attributeDecl) do
250
- (attributeId | redeclaredAttribute).as(:attributeDecl)
250
+ # redeclaredAttribute first: it anchors on SELF, so plain
251
+ # attribute names fail it instantly; the reverse order lets
252
+ # the unguarded fallback match a bare "SELF" and packrat
253
+ # memoization then blocks the retry (issue #581). The
254
+ # unguarded fallback rides only the definition site (the
255
+ # colon anchors it); references keep the guarded simpleId.
256
+ (redeclaredAttribute | (simpleId | unguardedId).as(:attributeId)).as(:attributeDecl)
251
257
  end
252
258
  rule(:attributeId) { simpleId.as(:attributeId) }
253
259
  rule(:attributeQualifier) do
@@ -686,6 +692,16 @@ module Expressir
686
692
  # whole identifier in a single step — parsanol GH-69.
687
693
  anyKeyword.absent? >> cts(match("[a-zA-Z_][a-zA-Z0-9_]*").as(:str)).as(:simpleId)
688
694
  end
695
+ rule(:unguardedId) do
696
+ # issue #581: keyword-named attributes ("value : INTEGER")
697
+ # are real-world EXPRESS and the core lane has always
698
+ # accepted them. Only the COLON-ANCHORED attribute-definition
699
+ # position takes this fallback — there the ":" stops the
700
+ # match before a closing keyword; guarded simpleId stays
701
+ # everywhere else (a keyword swallowed as an identifier
702
+ # expression would break "WHERE TRUE; END_TYPE").
703
+ cts(match("[a-zA-Z_][a-zA-Z0-9_]*").as(:str)).as(:simpleId)
704
+ end
689
705
  rule(:simpleStringLiteral) do
690
706
  cts((str("'") >> (str("'").absent? >> any).repeat >> str("'")).as(:str)).as(:simpleStringLiteral)
691
707
  end
@@ -633,6 +633,9 @@ rules:
633
633
  - rule: simpleId
634
634
  production: simple_id
635
635
  status: aligned
636
+ - rule: unguardedId
637
+ production: simple_id
638
+ status: aligned
636
639
  - rule: simpleStringLiteral
637
640
  production: simple_string_literal
638
641
  status: aligned
@@ -3,6 +3,6 @@ module Expressir
3
3
  # autoload it (Ruby autoload only works for module/class constants, not
4
4
  # for string constants like `Expressir::VERSION`).
5
5
  module Version
6
- VERSION = "2.4.48".freeze
6
+ VERSION = "2.4.50".freeze
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: expressir
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.48
4
+ version: 2.4.50
5
5
  platform: aarch64-linux
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2026-11-02 00:00:00.000000000 Z
11
+ date: 2026-11-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: base64
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 0.8.156
89
+ version: 0.8.159
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 0.8.156
96
+ version: 0.8.159
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: moxml
99
99
  requirement: !ruby/object:Gem::Requirement