cast 0.2.1 → 0.3.0

data/test/parser_test.rb

@@ -6,7 +6,7 @@
 
 require 'test_helper'
 
-class ParserTest < Test::Unit::TestCase
+class ParserTest < Minitest::Test
   def check(s)
     check_ast(s){|inp| @parser.parse(inp)}
   end
@@ -95,8 +95,8 @@ TranslationUnit
                 - Declarator
                     name: "i"
 EOS
-    assert_raise(C::ParseError){C::Parser.new.parse("")}
-    assert_raise(C::ParseError){C::Parser.new.parse(";")}
+    assert_raises(C::ParseError){C::Parser.new.parse("")}
+    assert_raises(C::ParseError){C::Parser.new.parse(";")}
   end
 
   def test_external_declaration
@@ -151,31 +151,31 @@ TranslationUnit
             name: "main"
 EOS
     # non-function type
-    assert_raise(C::ParseError){C::Parser.new.parse("int f {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("int f {}")}
 
     # both prototype and declist
-    assert_raise(C::ParseError){C::Parser.new.parse("void f(int argc, int argv) int argc, argv; {}")}
-    assert_raise(C::ParseError){C::Parser.new.parse("void f(int argc, argv) int argv; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("void f(int argc, int argv) int argc, argv; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("void f(int argc, argv) int argv; {}")}
 
     # bad param name
-    assert_raise(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argx, argc; {}")}
-    assert_raise(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argx, argc, argv; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argx, argc; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argx, argc, argv; {}")}
 
     # type missing
-    assert_raise(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argc; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("void f(argc, argv) int argc; {}")}
 
     # bad storage
-    assert_raise(C::ParseError){C::Parser.new.parse("typedef void f(argc, argv) int argc; {}")}
-    assert_raise(C::ParseError){C::Parser.new.parse("auto void f(argc, argv) int argc; {}")}
-    assert_raise(C::ParseError){C::Parser.new.parse("register void f(argc, argv) int argc; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("typedef void f(argc, argv) int argc; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("auto void f(argc, argv) int argc; {}")}
+    assert_raises(C::ParseError){C::Parser.new.parse("register void f(argc, argv) int argc; {}")}
 
     # duplicate storages
-    assert_raise(C::ParseError){C::Parser.new.parse("static  auto     int i;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("static  extern   int i;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("typedef register int i;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("static  auto     int i;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("static  extern   int i;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("typedef register int i;")}
 
     # `inline' can be repeated
-    assert_nothing_raised{C::Parser.new.parse("inline inline int i() {}")}
+    C::Parser.new.parse("inline inline int i() {}")  # no error
   end
 
   def test_declaration_list
@@ -846,12 +846,12 @@ TranslationUnit
                     name: "j"
 EOS
     # duplicate storages
-    assert_raise(C::ParseError){C::Parser.new.parse("static  auto     int     ;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("static  extern   int i   ;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("typedef register int i, j;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("static  auto     int     ;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("static  extern   int i   ;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("typedef register int i, j;")}
 
     # `inline' can be repeated
-    assert_nothing_raised{C::Parser.new.parse("inline inline int f();")}
+    C::Parser.new.parse("inline inline int f();")  # no error
   end
 
   def test_declaration_specifiers
@@ -1163,15 +1163,15 @@ TranslationUnit
                 name: "I"
 EOS
     # some illegal combos
-    assert_raise(C::ParseError){C::Parser.new.parse("int float;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("struct s {} int;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("_Complex;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("_Complex _Imaginary float;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("short long;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("signed unsigned char;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("int int;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("long char;")}
-    assert_raise(C::ParseError){C::Parser.new.parse("long long long;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("int float;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("struct s {} int;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("_Complex;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("_Complex _Imaginary float;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("short long;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("signed unsigned char;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("int int;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("long char;")}
+    assert_raises(C::ParseError){C::Parser.new.parse("long long long;")}
   end
 
   def test_struct_or_union_specifier
@@ -1313,7 +1313,7 @@ TranslationUnit
                             expr: Int (const)
 EOS
     # quals can be repeated
-    assert_nothing_raised{C::Parser.new.parse("void f() {sizeof(const const int);}")}
+    C::Parser.new.parse("void f() {sizeof(const const int);}")  # no error
   end
 
   def test_struct_declarator_list
@@ -2087,7 +2087,7 @@ void f() {
   ({;});
 }
 EOS
-    assert_raise(C::ParseError){@parser.parse(src)}
+    assert_raises(C::ParseError){@parser.parse(src)}
 
     @parser.enable_block_expressions
     check <<EOS

data/test/preprocessor_test.rb

@@ -8,12 +8,12 @@ require 'test_helper'
 
 # publicize the private methods so we can test them easily
 class C::Preprocessor
-  public :shellquote, :full_command
+  public :full_command
 end
-class PreprocessorTest < Test::Unit::TestCase
+class PreprocessorTest < Minitest::Test
   attr_accessor :cpp
   def setup
-    @cpp = C::Preprocessor.new
+    @cpp = C::Preprocessor.new(quiet: true)
     @cpp.include_path << 'dir1' << 'dir 2'
     @cpp.macros['V'] = nil
     @cpp.macros['I'] = 5
@@ -25,21 +25,15 @@ class PreprocessorTest < Test::Unit::TestCase
   def teardown
     FileUtils.rm_rf(TEST_DIR)
   end
-  def test_shellquote
-    assert_equal('a', cpp.shellquote('a'))
-    assert_equal("'a b'", cpp.shellquote('a b'))
-    assert_equal("'a$b'", cpp.shellquote('a$b'))
-    assert_equal("'a\"b'", cpp.shellquote("a\"b"))
-    assert_equal("'\\'", cpp.shellquote("\\"))
-    assert_equal("\"a'b\"", cpp.shellquote("a'b"))
-    assert_equal("\"a\\\\\\$\\\"'\"", cpp.shellquote("a\\$\"'"))
-  end
   def test_full_command
     original_command = C::Preprocessor.command
     C::Preprocessor.command = 'COMMAND'
-    assert_equal("COMMAND -Idir1 '-Idir 2' -DI=5 '-DS=\"blah\"' " <<
-                   "'-DSWAP(a,b)=a ^= b ^= a ^= b' -DV 'a file.c'",
-                 cpp.full_command('a file.c'))
+    assert_equal([
+      'COMMAND',
+      '-Idir1', '-Idir 2',
+      '-DI=5', '-DS="blah"', '-DSWAP(a,b)=a ^= b ^= a ^= b', '-DV',
+      'a file.c',
+    ], cpp.full_command('a file.c').shellsplit)
   ensure
     C::Preprocessor.command = original_command
   end
@@ -84,4 +78,8 @@ EOS
     assert_match(/int two = 2;/, output)
     assert_match(/int three = 3;/, output)
   end
+  def test_proprocess_warning
+    output = cpp.preprocess("#warning warning!")
+    refute_match /warning!/, output
+  end
 end

data/test/render_test.rb

@@ -6,7 +6,7 @@
 
 require 'test_helper'
 
-class RenderTest < Test::Unit::TestCase
+class RenderTest < Minitest::Test
   def setup
     @parser = C::Parser.new
     @parser.type_names << 'T'
@@ -629,7 +629,7 @@ class RenderTest < Test::Unit::TestCase
   # ------------------------------------------------------------------
   #                             PlainLabel
   # ------------------------------------------------------------------
-  
+
   def test_plain_label
     check(C::PlainLabel, <<-EOS)
       |one:
@@ -659,7 +659,7 @@ class RenderTest < Test::Unit::TestCase
   # ------------------------------------------------------------------
   #                               Comma
   # ------------------------------------------------------------------
-  
+
   def test_comma_two_expressions
     check(C::Comma, <<-EOS)
       |1, 2
@@ -843,7 +843,7 @@ class RenderTest < Test::Unit::TestCase
   # ------------------------------------------------------------------
   #                                Cast
   # ------------------------------------------------------------------
-  
+
   def test_cast
     check(C::Cast, <<-EOS)
       |(int)a
@@ -1711,6 +1711,21 @@ class RenderTest < Test::Unit::TestCase
       |1
     EOS
   end
+  def test_int_literal_oct
+    check(C::IntLiteral, <<-EOS)
+      |010
+    EOS
+  end
+  def test_int_literal_hex
+    check(C::IntLiteral, <<-EOS)
+      |0x10
+    EOS
+  end
+  def test_int_literal_suffix
+    check(C::IntLiteral, <<-EOS)
+      |1L
+    EOS
+  end
   # TODO: handle big ints -- this test fails
   def xtest_int_literal_big
     check(C::IntLiteral, <<-EOS)
@@ -1729,6 +1744,21 @@ class RenderTest < Test::Unit::TestCase
       |1.0
     EOS
   end
+  def test_float_literal_exponent
+    check(C::FloatLiteral, <<-EOS)
+      |1.23e45
+    EOS
+  end
+  def test_float_literal_suffix
+    check(C::FloatLiteral, <<-EOS)
+      |1.0f
+    EOS
+  end
+  def test_float_literal_hex_exponent
+    check(C::FloatLiteral, <<-EOS)
+      |0x12.abp3
+    EOS
+  end
   def test_float_literal_precise
     check(C::FloatLiteral, <<-EOS)
       |1.0000000001

data/test/test_helper.rb

@@ -3,7 +3,10 @@
 ROOT = File.expand_path('..', File.dirname(__FILE__))
 $:.unshift "#{ROOT}/lib"
 
-require 'test/unit'
+require 'minitest'
+require 'minitest/autorun'
+require 'minitest/focus'
+require 'pry'
 require 'stringio'
 require 'fileutils'
 require 'cast'
@@ -36,7 +39,7 @@ class Integer
   end
 end
 
-module Test::Unit::Assertions
+module Minitest::Assertions
   INDENT = '    '
   #
   # Assert that the given string is parsed as expected.  The given
@@ -71,7 +74,7 @@ module Test::Unit::Assertions
 
     # compare
     msg = "Debug strings unequal:\n#{juxtapose('Expected', exp, 'Output', out)}"
-    assert_block(msg){out == exp}
+    assert(out == exp, msg)
   end
   #
   # Return a string of `s1' and `s2' side by side with a dividing line
@@ -108,7 +111,7 @@ module Test::Unit::Assertions
   #
   def assert_error(klass, re)
     ex = nil
-    assert_raise(klass) do
+    assert_raises(klass) do
       begin
         yield
       rescue Exception => ex
@@ -183,7 +186,7 @@ module Test::Unit::Assertions
   # copy).
   #
   def assert_copy(exp, out)
-    assert_not_same exp, out
+    refute_same exp, out
     assert_equal exp, out
   end
   #

metadata

@@ -1,48 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cast
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ritual
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.8
+date: 2016-03-21 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - george.ogata@gmail.com
@@ -51,7 +18,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -62,8 +29,10 @@ files:
 - ext/cast.h
 - ext/extconf.rb
 - ext/parser.c
+- ext/yylex.c
 - ext/yylex.re
 - lib/cast.rb
+- lib/cast/c.tab.rb
 - lib/cast/c.y
 - lib/cast/c_nodes.rb
 - lib/cast/inspect.rb
@@ -83,38 +52,29 @@ files:
 - test/preprocessor_test.rb
 - test/render_test.rb
 - test/test_helper.rb
-- ext/yylex.c
-- lib/cast/c.tab.rb
 homepage: http://github.com/oggy/cast
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2706144592644454068
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2706144592644454068
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: C parser and AST constructor.
 test_files:
 - test/c_nodes_test.rb