ruco-cpp 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ea9a7d1f24ec125e36bf7f1b36b92346b6952bf
-  data.tar.gz: e17d83e242264ced49021b412f4b45ab88dd8982
+  metadata.gz: a6703adcbdc82415083f1d8798d6b74ff0a8580f
+  data.tar.gz: 2e1e889dbcb20cb8842e82fdb0cd3e26ab140acf
 SHA512:
-  metadata.gz: cff2dc32980df4615dfadb8240c3913d2debd9e9c1e822a6907329a11fdb4d26f4ba78ee87c3c703e42a10433197c900957241f39d74cc180aae299f4d50e2e8
-  data.tar.gz: 1185c51a35cf9c1025e3e2c7bd062b852908553ba27597771bf48f54c01a3cbfadd7076dd962b5bc4b374aff77d641d43b54b500294dc2d449e17ae73b9b5f17
+  metadata.gz: 1b68ae6e8f3abf0031faac1a00aa11aa571b37c3ac6164310ca711fbe269a1dabfb893a4acb6db14369295c99c1cfad1e05b9159ef1f8a2c358f76a1cc33e98e
+  data.tar.gz: 3f496105b8c62a239366101293ad3e6ba6f726c1f85e0dbde14c0e54bce3cd461faade18dee612f514917b36f3923909ea518e4e485e38b0e3b99d88c7a1d9df

data/lib/ruco.rb

@@ -212,6 +212,7 @@ module Ruco
 			@name = grammar_name
 			super(grammar_name)
 			@productions = {grammar_name => self}
+			@custom_tokens = {}
 			instance_eval(&block)
 		end
 
@@ -239,7 +240,7 @@ module Ruco
 			@productions[name] = p
 		end
 
-		def token(name, type)
+		def token(name, type, definitionstring)
 			p = Production.new(name)
 			case type
 			when :pascal_case
@@ -266,6 +267,11 @@ module Ruco
 				p.instance_eval do
 					one Token.new("char", @prodset)
 				end
+			when :custom
+				@custom_tokens["customToken#{name}"] = "#{definitionstring}"
+				p.instance_eval do
+					one Token.new("customToken#{name}", @prodset)
+				end
 			end
 			@productions[name] = p
 		end
@@ -440,6 +446,7 @@ namespace #{@name}
 		end
 
 		def generate_libhpp()
+
 			<<-HPPCONTENT
 
 #ifndef PARSE_#{@name.upcase}_HPP
@@ -756,6 +763,10 @@ $(OUT)/%.o:%.cpp $(OUT)/%.d
 
 			productions = productionlist.join("\n")
 
+			custom_tokens = @custom_tokens.map do |k,v|
+				"\t#{k} = #{v}."
+			end.join("\n")
+
 			<<-FRAMEEND
 
 #include <iostream>
@@ -788,7 +799,7 @@ TOKENS
 	pascalcase   = bigletter { bigletter | letter | digit }.
 	camelcase    = letter { bigletter | letter | digit }.
 
-	number      = digit { digit } [ '.' { digit } ].
+	number       = digit { digit } [ '.' digit { digit } ].
 	hexinteger   = '0' 'x' hex { hex }.
 
 	string       = '"' { stringCh | '\\\\' printable } '"'.
@@ -796,6 +807,8 @@ TOKENS
 	char         = '\\'' ( charCh | '\\\\' printable { hex } ) '\\''.
 	endOfLine    = cr | lf.
 
+#{custom_tokens}
+
 PRAGMAS
 	ddtSym    = '$' { digit | letter }. 
 	optionSym = '$' letter { letter } '='

data/lib/ruco/version.rb

@@ -1,3 +1,3 @@
 module Ruco
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ruco-cpp
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 description: Generates an LL(1) parser for a grammar described in a .ruco file
@@ -162,7 +162,6 @@ files:
 - ext/cocor/cygBuild.bat
 - ext/cocor/extconf.rb
 - ext/cocor/mingwbuild.bat
-- ext/cocor/mkmf.log
 - ext/cocor/zipsources.bat
 - lib/cocor.rb
 - lib/ruco.rb
@@ -178,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Boilerplate generator for Coco/R

data/ext/cocor/mkmf.log

@@ -1,57 +0,0 @@
-have_library: checking for main() in -lstdc++... -------------------- yes
-
-"gcc -o conftest -I/opt/chef/embedded/include/ruby-1.9.1/x86_64-darwin11.2.0 -I/opt/chef/embedded/include/ruby-1.9.1/ruby/backward -I/opt/chef/embedded/include/ruby-1.9.1 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -I/opt/chef/embedded/include -I/opt/chef/embedded/include -I/opt/chef/embedded/include/ncurses -arch x86_64 -O3 -g -pipe -Qunused-arguments -fno-common conftest.c  -L. -L/opt/chef/embedded/lib -L/opt/chef/embedded/lib -L. -L/opt/chef/embedded/lib -arch x86_64 -L/opt/chef/embedded/lib   -m64   -lruby.1.9.1  -lpthread -ldl -lobjc "
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main(int argc, char **argv)
-4: {
-5:   return 0;
-6: }
-/* end */
-
-"gcc -o conftest -I/opt/chef/embedded/include/ruby-1.9.1/x86_64-darwin11.2.0 -I/opt/chef/embedded/include/ruby-1.9.1/ruby/backward -I/opt/chef/embedded/include/ruby-1.9.1 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -I/opt/chef/embedded/include -I/opt/chef/embedded/include -I/opt/chef/embedded/include/ncurses -arch x86_64 -O3 -g -pipe -Qunused-arguments -fno-common conftest.c  -L. -L/opt/chef/embedded/lib -L/opt/chef/embedded/lib -L. -L/opt/chef/embedded/lib -arch x86_64 -L/opt/chef/embedded/lib   -m64   -lruby.1.9.1 -lstdc++  -lpthread -ldl -lobjc "
-conftest.c:4:53: error: use of undeclared identifier 'main'
-int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-                                                    ^
-1 error generated.
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
- 5: int main(int argc, char **argv)
- 6: {
- 7:   if (argc > 1000000) {
- 8:     printf("%p", &t);
- 9:   }
-10: 
-11:   return 0;
-12: }
-/* end */
-
-"gcc -o conftest -I/opt/chef/embedded/include/ruby-1.9.1/x86_64-darwin11.2.0 -I/opt/chef/embedded/include/ruby-1.9.1/ruby/backward -I/opt/chef/embedded/include/ruby-1.9.1 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -I/opt/chef/embedded/include -I/opt/chef/embedded/include -I/opt/chef/embedded/include/ncurses -arch x86_64 -O3 -g -pipe -Qunused-arguments -fno-common conftest.c  -L. -L/opt/chef/embedded/lib -L/opt/chef/embedded/lib -L. -L/opt/chef/embedded/lib -arch x86_64 -L/opt/chef/embedded/lib   -m64   -lruby.1.9.1 -lstdc++  -lpthread -ldl -lobjc "
-conftest.c:4:11: warning: implicit declaration of function 'main' is invalid in C99 [-Wimplicit-function-declaration]
-int t() { main(); return 0; }
-          ^
-1 warning generated.
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: int t() { main(); return 0; }
- 5: int main(int argc, char **argv)
- 6: {
- 7:   if (argc > 1000000) {
- 8:     printf("%p", &t);
- 9:   }
-10: 
-11:   return 0;
-12: }
-/* end */
-
---------------------
-