cast 0.3.0 → 0.4.0

data/lib/cast/c.y

@@ -12,8 +12,11 @@ translation_unit
 
 # Returns Declaration|FunctionDef
 external_declaration
-  : function_definition {result = val[0]}
-  | declaration         {result = val[0]}
+  : function_definition            {result = val[0]}
+  | declaration                    {result = val[0]}
+  # GCC EXTENSION: __extension__ can go before any external declaration
+  # this has no effect aside from suppressing certain warnings
+  | EXTENSION external_declaration {result = val[1]}
 
 # Returns FunctionDef
 function_definition
@@ -172,7 +175,11 @@ struct_declaration_list
 
 # Returns Declaration
 struct_declaration
-  : specifier_qualifier_list struct_declarator_list SEMICOLON {result = make_declaration(val[0][0], val[0][1], val[1])}
+  : specifier_qualifier_list struct_declarator_list SEMICOLON           {result = make_declaration(val[0][0], val[0][1], val[1])}
+  | specifier_qualifier_list                        SEMICOLON           {result = make_declaration(val[0][0], val[0][1], NodeArray[])}
+  # GCC EXTENSION: __extension__ can go before any struct_declaration
+  | EXTENSION specifier_qualifier_list struct_declarator_list SEMICOLON {result = make_declaration(val[1][0], val[1][1], val[2])}
+  | EXTENSION specifier_qualifier_list                        SEMICOLON {result = make_declaration(val[1][0], val[1][1], NodeArray[])}
 
 # Returns {Pos, [Symbol]}
 specifier_qualifier_list
@@ -381,6 +388,8 @@ unary_expression
   | unary_operator cast_expression {result = val[0][0].new_at(val[0][1], val[1])}
   | SIZEOF unary_expression        {result = Sizeof.new_at(val[0].pos, val[1])}
   | SIZEOF LPAREN type_name RPAREN {result = Sizeof.new_at(val[0].pos, val[2])}
+  # GCC extension: __extension__
+  | EXTENSION cast_expression      {result = val[1]}
 
 # Returns [Class, Pos]
 unary_operator

data/lib/cast/node.rb

@@ -9,20 +9,6 @@ module C
   # Abstract base class for all AST nodes.
   #
   class Node
-    #
-    # Called by the test suite to ensure all invariants are true.
-    #
-    def assert_invariants(testcase)
-      fields.each do |field|
-        if val = send(field.reader)
-          assert_same(self, node.parent, "field.reader is #{field.reader}")
-          if field.child?
-            assert_same(field, val.instance_variable_get(:@parent_field), "field.reader is #{field.reader}")
-          end
-        end
-      end
-    end
-
     #
     # Like self.new, but the first argument is taken as the position
     # of the Node.

data/lib/cast/node_list.rb

@@ -148,14 +148,6 @@ module C
   end
 
   class NodeArray
-    def assert_invariants(testcase)
-      super
-      testcase.assert_same(::Array, @array)
-      @array.each_with_index do |node, i|
-        assert_same(i, node.instance_variable_get(:@parent_index))
-      end
-    end
-
     def initialize
       super
       @array = []
@@ -177,31 +169,6 @@ module C
   end
 
   class NodeChain
-    def assert_invariants(testcase)
-      super
-      assert_same(@length.zero?, @first.nil?)
-      assert_same(@length.zero?, @last.nil?)
-      unless @length.zero?
-        assert_same(@first, self[0])
-        assert_same(@last, self[@length-1])
-        (0...@length.times).each do |i|
-          nodeprev = self[i].instance_variable_get(:@prev)
-          nodenext = self[i].instance_variable_get(:@next)
-          if i == 0
-            assert_nil(nodeprev)
-          else
-            assert_same(self[i-1], nodeprev)
-          end
-
-          if i == @length-1
-            assert_nil(nodenext)
-          else
-            assert_same(self[i+1], nodenext)
-          end
-        end
-      end
-    end
-
     def initialize
       super
       @first = nil

data/lib/cast/preprocessor.rb

@@ -29,11 +29,13 @@ module C
     end
     def preprocess(text)
       filename = nil
-      Tempfile.open(['cast-preprocessor-input.', '.c'], File.expand_path(pwd || '.')) do |file|
+      output = nil
+      Tempfile.open(['cast-preprocessor-input.', '.c']) do |file|
         filename = file.path
         file.puts text
+        file.flush
+        output = `#{full_command(filename)} #{'2> /dev/null' if @quiet}`
       end
-      output = `#{full_command(filename)} #{'2> /dev/null' if @quiet}`
       if $? == 0
         return output
       else

data/lib/cast/version.rb

@@ -1,5 +1,5 @@
 module C
-  VERSION = [0, 3, 0]
+  VERSION = [0, 4, 0]
 
   class << VERSION
     include Comparable

data/lib/cast.rb

@@ -1,3 +1,4 @@
+require "racc/parser" # used in cast and parser extensions
 require "cast/cast"
 require "cast/tempfile"
 require "cast/preprocessor"

data/test/c_nodes_test.rb

@@ -194,7 +194,7 @@ EOS
 
     c.wide = false
     assert(!c.wide?)
-    assert_equal(nil, c.prefix)
+    assert_nil(c.prefix)
   end
   def test_string_literal_wide
     s = C::StringLiteral.new('abc', 'L')
@@ -219,6 +219,6 @@ EOS
 
     s.wide = false
     assert(!s.wide?)
-    assert_equal(nil, s.prefix)
+    assert_nil(s.prefix)
   end
 end

data/test/node_list_test.rb

@@ -1298,7 +1298,7 @@ module NodeListArrayQueryTests
     assert_equal(0, list.index(a))
     assert_equal(1, list.index(l1))
     assert_equal(1, list.index(_List[C::Int.new(2)]))
-    assert_equal(nil, list.index([b]))
+    assert_nil(list.index([b]))
     assert_nil(list.index([a]))
     assert_nil(list.index(C::Int.new))
     assert_nil(list.index(nil))

data/test/parse_test.rb

@@ -1761,10 +1761,12 @@ Struct
     name: "s"
 EOS
     check C::Struct, <<EOS
-const struct {int i, j : 4;}
+const struct {float; int i, j : 4;}
 ----
 Struct (const)
     members:
+        - Declaration
+            type: Float
         - Declaration
             type: Int
             declarators:

data/test/parser_test.rb

@@ -118,6 +118,66 @@ TranslationUnit
 EOS
   end
 
+  def test_external_declaration_with_extension_kw
+    check <<EOS
+__extension__ typedef int blah;
+----
+TranslationUnit
+     entities:
+         - Declaration
+             storage: typedef
+             type: Int
+             declarators:
+                 - Declarator
+                     name: "blah"
+EOS
+  end
+
+def test_struct_member_declaration_with_extension_kw
+  check <<EOS
+struct { __extension__ int; __extension__ int i; int j; } blah;
+----
+TranslationUnit
+     entities:
+         - Declaration
+             type: Struct
+                 members:
+                     - Declaration
+                         type: Int
+                     - Declaration
+                         type: Int
+                         declarators:
+                             - Declarator
+                                 name: "i"
+                     - Declaration
+                         type: Int
+                         declarators:
+                             - Declarator
+                                 name: "j"
+             declarators:
+                 - Declarator
+                     name: "blah"
+EOS
+end
+
+def test_unary_extension_kw
+  check <<EOS
+void f() { __extension__ 0; }
+----
+TranslationUnit
+    entities:
+        - FunctionDef
+            type: Function
+                type: Void
+            name: "f"
+            def: Block
+                stmts:
+                    - ExpressionStatement
+                        expr: IntLiteral
+                            val: 0
+EOS
+end
+
   def test_function_def
     check <<EOS
 int main(int, char **) {}

data/test/preprocessor_test.rb

@@ -14,7 +14,7 @@ class PreprocessorTest < Minitest::Test
   attr_accessor :cpp
   def setup
     @cpp = C::Preprocessor.new(quiet: true)
-    @cpp.include_path << 'dir1' << 'dir 2'
+    @cpp.include_path << TEST_DIR << 'dir 2'
     @cpp.macros['V'] = nil
     @cpp.macros['I'] = 5
     @cpp.macros['S'] = '"blah"'
@@ -30,7 +30,7 @@ class PreprocessorTest < Minitest::Test
     C::Preprocessor.command = 'COMMAND'
     assert_equal([
       'COMMAND',
-      '-Idir1', '-Idir 2',
+      "-I#{TEST_DIR}", '-Idir 2',
       '-DI=5', '-DS="blah"', '-DSWAP(a,b)=a ^= b ^= a ^= b', '-DV',
       'a file.c',
     ], cpp.full_command('a file.c').shellsplit)

data/test/test_helper.rb

@@ -189,10 +189,4 @@ module Minitest::Assertions
     refute_same exp, out
     assert_equal exp, out
   end
-  #
-  # Assert the invariants of `node'.
-  #
-  def assert_invariants(node)
-    node.assert_invariants(self)
-  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cast
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - George Ogata
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - george.ogata@gmail.com
 executables: []
@@ -56,7 +56,7 @@ homepage: http://github.com/oggy/cast
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: C parser and AST constructor.
 test_files: