ruco-cpp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4494f4f761644cc7fc1e851c283d2900d68457c4
-  data.tar.gz: 1ff4866a37ade60fa26623c7f95daf996bee14c0
+  metadata.gz: 9b331baee02e089e9653dab9371290ade59cb84a
+  data.tar.gz: d62e2a8b717d1adcc11923783252ee699895fbc8
 SHA512:
-  metadata.gz: 8df637ba1c96dc874878c1fd96af9289e84d2d3c34f54fed71cb3ab682d71df8c54552fb96ed4f4910b5251a5f0acf222400531733aab5c2a13db2bd5cd7ecd7
-  data.tar.gz: fd06382812ff16811298065bf94f243b08feebb785318a779963ada4eda4933dfd2f8846a73e10d0a783392bdf0843bf6b677f0b5cec49e6e040c6c4d7c1c757
+  metadata.gz: c7ec2e512df2b42a1a560e698e2a3b10f8b7ee4e9ec2645d180dae319949a1d641280b1e43261d9f117e5e305eeb2c6e1972814af0bab466c9fced433154823a
+  data.tar.gz: b0ecaca02d60125ff492ff071b8afd162bc78c44318d879a6bb5cc7eac8d1e9d2896e92852d65c687f16b55b83fa962c05ece22db8b2b324c3a7f8df95b9384c

data/lib/ruco/version.rb

@@ -1,3 +1,3 @@
 module Ruco
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/ruco.rb

@@ -128,6 +128,7 @@ module Ruco
 			g.instance_eval do
 				one thing
 			end
+			g.multiply
 			one g
 		end
 
@@ -146,9 +147,21 @@ module Ruco
 				end if options 
 				one thing
 			end
+			g.multiply
 			one g
 		end
 
+		def multiply
+			@stuff.each do |x|
+				if x.is_a? Group
+					x.multiply
+				elsif x.is_a? LitString
+				else
+					@prodset[x.name][:count] += 1
+				end
+			end
+		end
+
 		def group(&block)
 			g = Group.new :normal, @prodset
 			g.instance_eval(&block)
@@ -245,6 +258,14 @@ module Ruco
 				p.instance_eval do
 					one Token.new("integer", @prodset)
 				end
+			when :string
+				p.instance_eval do
+					one Token.new("string", @prodset)
+				end
+			when :char
+				p.instance_eval do
+					one Token.new("char", @prodset)
+				end
 			end
 			@productions[name] = p
 		end
@@ -379,6 +400,7 @@ PARENTDECL
 class #{prodname} #{parent_declaration}
 {
 public:
+	unsigned _line, _col;
 #{members}
 };
 typedef std::shared_ptr<#{prodname}> #{prodname}Ptr;
@@ -418,6 +440,7 @@ namespace #{@name}
 		end
 
 		def generate_libhpp()
+
 			<<-HPPCONTENT
 
 #ifndef PARSE_#{@name.upcase}_HPP
@@ -443,6 +466,11 @@ namespace #{@name}
 
 namespace #{@name}
 {
+	/**
+	 * Exception thrown when the specified source file is not found
+	 */
+	class FileNotFoundException {};
+
 	/**
 	 * Parses a source file into the data structure of #{@name}
 	 */
@@ -463,6 +491,8 @@ namespace #{@name}
 
 			pset = <<-PSETEND
 		object[L"_type"] = picojson::value(L"#{prodname}");
+		object[L"_col"] = picojson::value((double)pointer->_col);
+		object[L"_line"] = picojson::value((double)pointer->_line);
 			PSETEND
 
 			if prod.prodtype == :variation
@@ -512,12 +542,14 @@ namespace #{@name}
 
 						elsif prodinfo[:type] == :id
 							members_code += <<-PSETEND
+		if (pointer->#{key.downcase})
+		{
+			picojson::object #{key.downcase};
 
-		picojson::object #{key.downcase};
-
-		#{key.downcase} = Compile#{key}(pointer->#{key.downcase});
+			#{key.downcase} = Compile#{key}(pointer->#{key.downcase});
 
-		object[L"#{key.downcase}"] = picojson::value(#{key.downcase});
+			object[L"#{key.downcase}"] = picojson::value(#{key.downcase});
+		}
 							PSETEND
 						end
 
@@ -529,14 +561,14 @@ namespace #{@name}
 						elsif prodinfo[:type] == :id
 							members_code += <<-PSETEND
 
-		picojson::array #{key.downcase}s;
+		picojson::array #{key.downcase.pluralize};
 
-		for(unsigned i=0; i<pointer->#{key.downcase}s.size(); i++)
+		for(unsigned i=0; i<pointer->#{key.downcase.pluralize}.size(); i++)
 		{
-			#{key.downcase}s.push_back(picojson::value(Compile#{key}(pointer->#{key.downcase}s[i])));
+			#{key.downcase.pluralize}.push_back(picojson::value(Compile#{key}(pointer->#{key.downcase.pluralize}[i])));
 		}
 
-		object[L"#{key.downcase}s"] = picojson::value(#{key.downcase}s);
+		object[L"#{key.downcase.pluralize}"] = picojson::value(#{key.downcase.pluralize});
 							PSETEND
 						end
 
@@ -600,6 +632,10 @@ namespace #{@name}
 	#{@name}Ptr Parse(std::string sourceFile)
 	{
 		std::shared_ptr<FILE> fp (fopen(sourceFile.c_str(), "r"), fclose);
+		if (!fp)
+		{
+			throw FileNotFoundException();
+		}
 		std::shared_ptr<Scanner> scanner (new Scanner(fp.get()));
 		std::shared_ptr<Parser> parser (new Parser(scanner.get()));
 		parser->Parse();
@@ -701,10 +737,16 @@ $(OUT)/%.o:%.cpp $(OUT)/%.d
 
 				constructor = "(. production = std::make_shared<class #{prodname}>(); .)" if prod.prodtype == :normal
 
+				linecolreg = "(. unsigned curline = la->line, curcol = la->col; .)"
+
+				recordlinecol = "(. production->_line = curline; production->_col = curcol; .)"
+
 				production_string = <<-PRODUCTION
 #{prodname}#{attributes} = #{constructor}
+#{linecolreg}
 #{declarations}
 #{prod.generate}
+#{recordlinecol}
 .
 				PRODUCTION
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ruco-cpp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-01-06 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.6
 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 */
-
---------------------
-