Merge branch 'master' into jwi-idlversion4

RemedyIT · Jul 13, 2023 · 40a316b · 40a316b
2 parents 0545ae3 + 4a5c6d1
commit 40a316b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 50 deletions.
diff --git a/.github/workflows/taox11.yml b/.github/workflows/taox11.yml
@@ -74,6 +74,11 @@ jobs:
             CXX: g++-12
             ruby: '3.2'
             PackageDeps: g++-12
+          - os: ubuntu-22.04
+            CC: gcc-13
+            CXX: g++-13
+            ruby: '3.2'
+            PackageDeps: g++-13
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }}
     env:

diff --git a/README.rdoc b/README.rdoc
@@ -20,7 +20,8 @@ RIDL provides a framework for implementing compiler/generators for OMG standard
 * a builtin IDL preprocessor expression parser/evaluator
 * a flexible framework for pluggable (and stackable) backends
 * basic support for backend code re-generation
-* compliant with the {OMG IDL 3.5}[https://www.omg.org/spec/IDL/3.5] standard.
+* compliant with the {OMG IDL 3.5}[https://www.omg.org/spec/IDL/3.5] standard
+* support for {OMG IDL 4.2}[https://www.omg.org/spec/IDL/4.2] annotations
 
 Remedy IT has developed multiple backends for RIDL. These include:
 * {R2CORBA}[https://www.remedy.nl/opensource/r2corba.html] generating Ruby code

diff --git a/lib/ridl/parser.diff b/lib/ridl/parser.diff
diff --git a/lib/ridl/scanner.rb b/lib/ridl/scanner.rb
@@ -83,13 +83,6 @@ def getc
         else
           @pos.column += 1
         end
-
-        if false
-          if not @bwd.nil? or cur.nil? or @fwd.nil?
-          printf("%c(%02x), %c(%02x), %c(%02x) @(l:%d,c:%d)\n",
-                @bwd, @bwd, cur, cur, @fwd, @fwd, @pos.line, @pos.column)
-          end
-        end
         @bwd = cur
       end