cast 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.1 2012-12-19
+
+ * Parse adjacent string literals correctly.
+
 == 0.2.0 2012-05-14
 
  * Works with Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3.

data/Rakefile

@@ -1,4 +1,11 @@
 require 'ritual'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
 
 extension
 

data/cast.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |gem|
   gem.version = C::VERSION
   gem.authors = ["George Ogata"]
   gem.email = ["george.ogata@gmail.com"]
+  gem.license = 'MIT'
   gem.date = Time.now.strftime('%Y-%m-%d')
   gem.summary = "C parser and AST constructor."
   gem.homepage = 'http://github.com/oggy/cast'

data/lib/cast/c.y

@@ -532,8 +532,10 @@ enumeration_constant
   : ID {result = val[0]}
 
 # Returns StringLiteral
+# Also handles string literal concatenation (6.4.5.4)
 string_literal
-  : SCON {result = val[0].val; result.pos = val[0].pos}
+  : string_literal SCON {val[0].val << val[1].val.val; result = val[0]}
+  | SCON { result = val[0].val; result.pos = val[0].pos }
 
 ---- inner
   # A.1.9 -- Preprocessing numbers -- skip

data/lib/cast/version.rb

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

data/test/c_nodes_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 class MiscTests < Test::Unit::TestCase
 

data/test/lexer_test.rb

@@ -6,7 +6,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 class LexerTest < Test::Unit::TestCase
   def check(s)

data/test/node_list_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 #
 # NodeListTest classes are abstract, inherited by classes which define

data/test/node_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 Chain = C::NodeChain
 

data/test/parse_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 class MatchTest < Test::Unit::TestCase
   def setup
@@ -1934,6 +1934,15 @@ EOS
     assert_raise(C::ParseError){C::StringLiteral.parse('return')}
   end
 
+  def test_string_literal_concatenation
+    check C::StringLiteral, <<EOS
+"hello" " " "world!"
+----
+StringLiteral
+    val: "hello world!"
+EOS
+  end
+
   def test_char_literal
     check C::CharLiteral, <<EOS
 'x'

data/test/parser_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 class ParserTest < Test::Unit::TestCase
   def check(s)

data/test/preprocessor_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 # publicize the private methods so we can test them easily
 class C::Preprocessor

data/test/render_test.rb

@@ -4,7 +4,7 @@
 #
 ######################################################################
 
-require 'test/test_helper'
+require 'test_helper'
 
 class RenderTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cast
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ritual
-  requirement: &70254348936800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70254348936800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70254349108160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 1.4.8
   type: :development
   prerelease: false
-  version_requirements: *70254349108160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.8
 description: 
 email:
 - george.ogata@gmail.com
@@ -64,7 +74,6 @@ files:
 - lib/cast/tempfile.rb
 - lib/cast/to_s.rb
 - lib/cast/version.rb
-- test/all.rb
 - test/c_nodes_test.rb
 - test/lexer_test.rb
 - test/node_list_test.rb
@@ -77,7 +86,8 @@ files:
 - ext/yylex.c
 - lib/cast/c.tab.rb
 homepage: http://github.com/oggy/cast
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -88,20 +98,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: C parser and AST constructor.
 test_files:
-- test/all.rb
 - test/c_nodes_test.rb
 - test/lexer_test.rb
 - test/node_list_test.rb
@@ -111,4 +126,3 @@ test_files:
 - test/preprocessor_test.rb
 - test/render_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/test/all.rb

@@ -1,5 +0,0 @@
-require 'test/test_helper'
-
-Dir["#{ROOT}/test/**/*_test.rb"].each do |path|
-  require path
-end