Fixed grammar, no default label detection for wchar

* lib/ridl/node.rb: * lib/ridl/parser.rb: * lib/ridl/parser.ry:
RemedyIT · Jul 17, 2023 · 4a4e193 · 4a4e193
1 parent 74bd5ab
commit 4a4e193
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/ridl/node.rb b/lib/ridl/node.rb
@@ -2722,6 +2722,7 @@ def has_default?
 
     def default_label
       swtype = @switchtype.resolved_type
+      return nil if IDL::Type::WChar === swtype
       lbls = members.collect { |m| m.labels.include?(:default) ? [] : m.labels.collect { |l| l.value } }.flatten
       lbls = lbls.sort unless IDL::Type::Boolean === swtype ## work around bug in Ruby 1.9.2
       def_lbl = swtype.min

diff --git a/lib/ridl/parser.rb b/lib/ridl/parser.rb
diff --git a/lib/ridl/parser.ry b/lib/ridl/parser.ry
@@ -663,8 +663,8 @@ rule
                    | boolean_type
                    | enum_type
                    | scoped_name
-                   | octet_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end }
-                   | wide_char_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end }
+                   | octet_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::Octet.new end }
+                   | wide_char_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::WChar.new end }
 
   union_body : union_case
              | union_body union_case