cog 0.3.1 → 0.3.2

data/BuiltIn.cogfile

@@ -8,8 +8,20 @@ language :c do |l|
   l.comment '//'
   l.multiline_comment '/*', '*/'
   l.extension :c, :h
+  l.seed_extension :c, :header => :h
   l.include_guard_begin {|name| "#ifndef #{name.underscore.upcase}\n#define #{name.underscore.upcase}"}
   l.include_guard_end {|name| "#endif"}
+  l.reserved %w(auto break case char const continue default do double else enum extern float for goto if int long register return short signed sizeof static struct switch typedef union unsigned void volatile while _Packed)
+
+  l.map_boolean('bool') { |x| (!!x).inspect }
+  l.map_integer('int') { |x| x.to_i.inspect if x.to_i.signed?(16) }
+  l.map_long('long') { |x| x.to_i.inspect + "l" if x.to_i.signed?(32) }
+  l.map_float('float') { |x| x.to_f.inspect + "f" }
+  l.map_double('double') { |x| x.to_f.inspect }
+  l.map_char('char') { |x| x.to_s.length == 1 && "'#{x}'" }
+  l.map_string('char *') { |x| x.to_s.inspect }
+  l.map_null('void *') { |x| x.nil? && 'NULL' }
+  l.map_void('void')
 end
 
 language 'c++' do |l|
@@ -17,17 +29,41 @@ language 'c++' do |l|
   l.comment_style :c
   l.include_guard_style :c
   l.extension :h, :hh, :hpp, :hxx, 'h++', :cc, :cpp, :cxx, 'c++'
+  l.seed_extension :cpp, :header => :h
   l.use_named_scope {|name| "using namespace #{name};"}
   l.named_scope_begin {|name| "namespace #{name} {"}
   l.named_scope_end {|name| "} // namespace #{name}"}
+  l.reserved %w(INT_MAX INT_MIN MAX_RAND NULL and and_eq asm auto bitand bitor bool break case catch char cin class compl const const_cast continue cout default delete do double dynamic_cast else endl enum explicit extern false float for friend goto if include inline int iomanip iostream long main mutable namespace new not not_eq npos operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast std string struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq")
+
+  l.map_boolean('bool') { |x| (!!x).inspect }
+  l.map_integer('int') { |x| x.to_i.inspect if x.to_i.signed?(16) }
+  l.map_long('long') { |x| x.to_i.inspect + "l" if x.to_i.signed?(32) }
+  l.map_float('float') { |x| x.to_f.inspect + "f" }
+  l.map_double('double') { |x| x.to_f.inspect }
+  l.map_char('char') { |x| x.to_s.length == 1 && "'#{x}'" }
+  l.map_string('std::string') { |x| x.to_s.inspect }
+  l.map_null('void *') { |x| x.nil? && 'NULL' }
+  l.map_void('void')
 end
 
 language 'c#' do |l|
   l.name 'C#'
   l.comment_style :c
   l.extension :cs
+  l.seed_extension :cs
   l.named_scope_begin {|name| "namespace #{name} {"}
   l.named_scope_end {|name| "} // namespace #{name}"}
+  l.reserved %w(abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual void volatile while)
+
+  l.map_boolean('bool') { |x| (!!x).inspect }
+  l.map_integer('int') { |x| x.to_i.inspect if x.to_i.signed?(32) }
+  l.map_long('long') { |x| x.to_i.inspect + "L" }
+  l.map_float('float') { |x| x.to_f.inspect + "F" }
+  l.map_double('double') { |x| x.to_f.inspect }
+  l.map_char('char') { |x| x.to_s.length == 1 && "'#{x}'" }
+  l.map_string('string') { |x| x.to_s.inspect }
+  l.map_null('Object') { |x| x.nil? && 'null' }
+  l.map_void('void')
 end
 
 language :css do |l|
@@ -48,22 +84,57 @@ language :java do |l|
   l.name 'Java'
   l.comment_style :c
   l.extension :java
+  l.seed_extension :java
   l.named_scope_begin {|name| "package #{name};"}
   l.named_scope_end {|name| "// end of package #{name}"}
+  l.reserved %w(abstract assert boolean break byte case catch char class const continue default do double else enum extends false final finally float for goto if implements import instanceof int interface long native new null package private protected public return short static strictfp super switch synchronized this throw throws transient true try void volatile while)
+
+  l.map_boolean('boolean') { |x| (!!x).inspect }
+  l.map_integer('int') { |x| x.to_i.inspect if x.to_i.signed?(32) }
+  l.map_long('long') { |x| x.to_i.inspect + "L" }
+  l.map_float('float') { |x| x.to_f.inspect + "f" }
+  l.map_double('double') { |x| x.to_f.inspect + "d" }
+  l.map_char('char') { |x| x.to_s.length == 1 && "'#{x}'" }
+  l.map_string('String') { |x| x.to_s.inspect }
+  l.map_null('Object') { |x| x.nil? && 'null' }
+  l.map_void('void')
 end
 
 language :javascript do |l|
   l.name 'JavaScript'
   l.comment_style :c
   l.extension :js
+  l.seed_extension :js
   l.named_scope_begin {|name| "var #{name} = { // named scope"}
   l.named_scope_end {|name| "}; // end of named scope #{name}"}
+  l.reserved %w(Array Date Infinity JavaArray JavaClass JavaObject JavaPackage Math NaN Number Object String abstract alert all anchor anchors area assign blur boolean break button byte case catch char checkbox class clearInterval clearTimeout clientInformation close closed confirm const constructor continue crypto debugger decodeURI decodeURIComponent default defaultStatus delete do document double element elements else embed embeds encodeURI encodeURIComponent enum escape eval event export extends false fileUpload final finally float focus for form forms frame frameRate frames function function getClass goto hasOwnProperty hidden history if image images implements import in innerHeight innerWidth instanceof int interface isFinite isNaN isPrototypeOf java layer layers length let link location long mimeTypes name native navigate navigator new null offscreenBuffering onbeforeunload onblur onclick oncontextmenu ondragdrop ondragdrop onerror onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseout onmouseover onmouseup onreset onsubmit onunload open opener option outerHeight outerWidth package packages pageXOffset pageYOffset parent parseFloat parseInt password pkcs11 plugin private prompt propertyIsEnum protected prototype public radio reset return screenX screenY scroll secure select self setInterval setTimeout short static status submit super switch synchronized taint text textarea this throw throws toString top transient true try typeof undefined unescape untaint valueOf var void volatile while window with)
+
+  l.map_boolean('Boolean') { |x| (!!x).inspect }
+  l.map_integer('Number') { |x| x.to_i.inspect }
+  l.map_long('Number') { |x| x.to_i.inspect }
+  l.map_float('Number') { |x| x.to_f.inspect }
+  l.map_double('Number') { |x| x.to_f.inspect }
+  l.map_char('String') { |x| x.to_s.inspect }
+  l.map_string('String') { |x| x.to_s.inspect }
+  l.map_null('Object') { |x| x.nil? && 'null' }
 end
 
 language :objc do |l|
   l.name 'Objective-C'
   l.comment_style :c
   l.extension :h, :m, :mm
+  l.seed_extension :m, :header => :h
+  l.reserved %w(@catch @class @dynamic @end @finally @implementation @interface @private @property @protected @protocol @public @selector @synthesize @throw @try BOOL Class IMP NO NULL Protocol SEL YES _Bool _Complex _Imaginery atomic auto break bycopy byref case char const continue default do double else enum extern float for goto id if in inline inout int long nil nonatomic oneway out register restrict retain return self short signed sizeof static struct super switch typedef union unsigned void volatile while)
+
+  l.map_boolean('BOOL') { |x| x ? 'YES' : 'NO' }
+  l.map_integer('int') { |x| x.to_i.inspect if x.to_i.signed?(16) }
+  l.map_long('long') { |x| x.to_i.inspect + "l" if x.to_i.signed?(32) }
+  l.map_float('float') { |x| x.to_f.inspect + "f" }
+  l.map_double('double') { |x| x.to_f.inspect }
+  l.map_char('char') { |x| x.to_s.length == 1 && "'#{x}'" }
+  l.map_string('NSString *') { |x| "@" + x.to_s.inspect }
+  l.map_null('id') { |x| x.nil? && 'nil' }
+  l.map_void('void')
 end
 
 language :python do |l|
@@ -71,6 +142,17 @@ language :python do |l|
   l.comment '#'
   l.multiline_comment "'''", "'''"
   l.extension :py
+  l.seed_extension :py
+  l.reserved %w(Data False Float Int None Numeric Oxphys True acos and array asin assert atan break class close continue cos def del e elif else except exec exp fabs finally float floor for from global if import in input int is lambda log log10 not open or pass pi print raise range return sin sqrt tan try type while write zeros)
+
+  l.map_boolean('bool') { |x| x ? 'True' : 'False' }
+  l.map_integer('int') { |x| x.to_i.inspect }
+  l.map_long('int') { |x| x.to_i.inspect }
+  l.map_float('float') { |x| x.to_f.inspect }
+  l.map_double('float') { |x| x.to_f.inspect }
+  l.map_char('str') { |x| x.to_s.inspect }
+  l.map_string('str') { |x| x.to_s.inspect }
+  l.map_null('object') { |x| x.nil? && 'None' }
 end
 
 language :qt do |l|
@@ -83,8 +165,19 @@ language :ruby do |l|
   l.comment '#'
   l.multiline_comment '=begin', '=end'
   l.extension :rb
+  l.seed_extension :rb
   l.named_scope_begin {|name| "module #{name} # named scope"}
   l.named_scope_end {|name| "end # named scope #{name}"}
+  l.reserved %w(BEGIN END __FILE__ __LINE__ alias and begin break case class def defined? do else elsif end ensure false for if in module next nill not or redo rescue retry return self super then true undef unless until when while)
+  
+  l.map_boolean('!!') { |x| (!!x).inspect }
+  l.map_integer('Fixnum') { |x| x.to_i.inspect }
+  l.map_long('Fixnum') { |x| x.to_i.inspect }
+  l.map_float('Float') { |x| x.to_f.inspect }
+  l.map_double('Float') { |x| x.to_f.inspect }
+  l.map_char('String') { |x| x.to_s.inspect }
+  l.map_string('String') { |x| x.to_s.inspect }
+  l.map_null('Object') { |x| x.nil? && 'nil' }
 end
 
 language :xml do |l|

data/bin/cog

@@ -21,17 +21,28 @@ switch :colorless
 
 desc 'Add cog to the project in the present working directory'
 command :init do |c|
-
   c.action do |gopt, opt, args|
     Cog.initialize_project
   end
 end
 
-desc 'Manage project generators'
+desc 'Run and manage project generators'
+long_desc 'Omit generator name to run all of them'
+arg_name 'name'
 command [:generator, :gen] do |c|
   
-  c.default_command :run
-  
+  c.default_desc 'Run generators'
+  c.action do |gopt, opt, args|
+    Cog::Embeds.gather_from_project
+    if args.empty?
+      Cog::Controllers::GeneratorController.run_all
+    else
+      args.each do |name|
+        Cog::Controllers::GeneratorController.run name
+      end
+    end
+  end
+
   c.desc 'List project generators'
   c.command :list do |sub|
     sub.action do |gopt, opt, args|
@@ -62,35 +73,15 @@ command [:generator, :gen] do |c|
       end
     end
   end
-  
-  c.desc 'Run project generators'
-  c.long_desc 'Omit generator name to run all of them'
-  c.arg_name 'name'
-  c.command :run do |sub|
-    sub.action do |gopt, opt, args|
-      Cog::Embeds.gather_from_project
-      if args.empty?
-        Cog::Controllers::GeneratorController.run_all
-      else
-        args.each do |name|
-          Cog::Controllers::GeneratorController.run name
-        end
-      end
-    end
-  end
 end
 
-desc 'List or create DSLs known as cog plugins'
-command :plugin do |c|
-  
-  c.default_command :list
-  
-  c.desc 'List the available plugins'
-  c.command :list do |sub|
-    sub.action do |gopt, opt, args|
-      x = Cog::Controllers::PluginController.list
-      puts x.join "\n" unless x.empty?
-    end
+desc 'List or create plugins'
+command [:plugin, :pl] do |c|
+    
+  c.default_desc 'List the available plugins'
+  c.action do |gopt, opt, args|
+    x = Cog::Controllers::PluginController.list
+    puts x.join "\n" unless x.empty?
   end
   
   c.desc 'Create a new plugin'
@@ -104,22 +95,17 @@ command :plugin do |c|
   end
 end
 
-desc 'Manage templates'
+desc 'List or create ERB templates'
 command [:template, :tm] do |c|
   
-  c.default_command :list
-  
-  c.desc 'List the available templates'
-  c.command :list do |sub|
-    sub.action do |gopt, opt, args|
-      x = Cog::Controllers::TemplateController.list
-      puts x.join "\n" unless x.empty?
-    end
+  c.default_desc 'List the available templates'
+  c.action do |gopt, opt, args|
+    x = Cog::Controllers::TemplateController.list
+    puts x.join "\n" unless x.empty?
   end
   
   c.desc 'Create a new project template'
   c.command :new do |sub|
-
     sub.action do |gopt, opt, args|
       args.each do |name|
         Cog::Controllers::TemplateController.create name, :force_override => opt[:f]
@@ -128,22 +114,15 @@ command [:template, :tm] do |c|
   end
 end
 
-desc 'Review supported languages'
-command [:language, :lang] do |c|
-  
-  c.default_command :list
-  
-  c.desc 'List the supported languages'
-  c.command :list do |sub|
-    sub.action do
-      summary = Cog.language_summary
-      w = summary.collect {|info| info.name.length}.max
-      summary.each do |info|
-        puts info.to_s(w)
-      end
+desc 'List supported languages'
+command :lang do |c|
+  c.action do
+    summary = Cog.language_summary
+    w = summary.collect {|info| info.name.length}.max
+    summary.each do |info|
+      puts info.to_s(w)
     end
   end
-  
 end
 
 pre do |gopt, command, opt, args|

data/built_in/templates/cog/c++/feature.cpp.erb

@@ -0,0 +1,7 @@
+<% unless abstract? %>
+<%= return_type.to_prim %> <%= seed.name %>::<%= name %>(<%= params.collect(&:stamp_decl).join ', ' %>)
+{
+    // keep: <%= keep_name %> 
+}
+
+<% end %>

data/built_in/templates/cog/c++/feature.h.erb

@@ -0,0 +1,7 @@
+    /**
+      <%= desc %> 
+<% params.each do |p| %>
+      @param <%= p.name %> <%= p.desc %> 
+<% end %>
+     */
+    <%= return_type.to_prim %> <%= name %>(<%= params.collect(&:stamp_decl).join ', ' %>)<% if abstract? %> = 0<% end %>;

data/built_in/templates/cog/c++/seed.cpp.erb

@@ -0,0 +1,11 @@
+<%= warning %> 
+
+#include "<%= header_path %>"
+
+<% if in_scope %>
+<%= use_named_scope in_scope %> 
+<% end %>
+
+<% features.each do |f| %>
+<%= f.stamp_method %> 
+<% end %>

data/built_in/templates/cog/c++/seed.h.erb

@@ -0,0 +1,16 @@
+<%= warning %> 
+
+<%= guard %> 
+
+<% if in_scope %>
+<%= named_scope_begin in_scope %> 
+<% end %>
+
+class <%= name %> 
+{
+<% features.each do |f| %>
+<%= f.stamp_method %> 
+<% end %>
+};
+
+<%= end_all_scopes %> 

data/built_in/templates/cog/c++/var_decl.cpp.erb

@@ -0,0 +1 @@
+<%= type.to_prim %> <% if qualify? %><%= scope %>::<% end %><%= name %>

data/lib/cog.rb

@@ -4,6 +4,7 @@ require 'rainbow'
 
 require 'cog/errors'
 require 'cog/native_extensions'
+require 'cog/primitive'
 
 # This top level module serves as a singleton instance of the {Config} interface. It is configured with various cogfiles, which are evaluated as instances of {DSL::Cogfile}.
 module Cog
@@ -18,6 +19,7 @@ module Cog
   autoload :Helpers, 'cog/helpers'
   autoload :Language, 'cog/language'
   autoload :Plugin, 'cog/plugin'
+  autoload :Seed, 'cog/seed'
   autoload :VERSION, 'cog/version'
   
   extend Config
@@ -35,4 +37,9 @@ module Cog
     nil
   end
 
+  def self.seed(name, &block)
+    s = DSL::SeedDSL.new name
+    block.call s unless block.nil?
+    s.seed
+  end
 end

data/lib/cog/config/language_config.rb

@@ -17,7 +17,6 @@ module Cog
       # @yield within this block the {#active_language} will be set to the desired value
       # @return [Object] the value returned by the block
       def activate_language(key, opt={}, &block)
-        throw :ActivateLanguageRequiresABlock if block.nil?
         opt, key = key, nil if key.is_a? Hash
         key = if opt[:ext]
           ext = opt[:ext].to_s.downcase
@@ -31,9 +30,11 @@ module Cog
         end
         if key
           @active_languages << @language[key]
-          r = block.call
-          @active_languages.pop
-          r
+          if block
+            r = block.call
+            @active_languages.pop
+            r
+          end
         else
           block.call
         end

data/lib/cog/dsl.rb

@@ -2,8 +2,9 @@ module Cog
   module DSL
     
     autoload :Cogfile, 'cog/dsl/cogfile'
+    autoload :FeatureDSL, 'cog/dsl/feature_dsl'
     autoload :LanguageDSL, 'cog/dsl/language_dsl'
-    autoload :PluginDSL, 'cog/dsl/plugin_dsl'
+    autoload :SeedDSL, 'cog/dsl/seed_dsl'
     
   end
 end

data/lib/cog/dsl/cogfile.rb

@@ -33,12 +33,12 @@ module Cog
         nil
       end
     
-      # Define the directory in which to generate code
+      # Define the directory in which to generate code. A call to this method will be ignored if the containing cogfile is being treated as a plugin.
       # @param path [String] a file system path to a directory
       # @param absolute [Boolean] if +false+, the path is relative to {Config::ProjectConfig#project_root}
       # @return [nil]
       def project_path(path, absolute=false)
-        return if @cogfile_context[:plugin_path_only]
+        return if plugin_path_only? || plugin?
         path = File.join @cogfile_context[:cogfile_dir], path unless absolute
         config_eval { @project_path = path }
       end
@@ -48,7 +48,7 @@ module Cog
       # @param absolute [Boolean] if +false+, the path is relative to {Config::ProjectConfig#project_root}
       # @return [nil]
       def generator_path(path, absolute=false)
-        return if @cogfile_context[:plugin_path_only]
+        return if plugin_path_only?
         add_config_path :generator, path, absolute
       end
 
@@ -57,15 +57,16 @@ module Cog
       # @param absolute [Boolean] if +false+, the path is relative to {Config::ProjectConfig#project_root}
       # @return [nil]
       def template_path(path, absolute=false)
-        return if @cogfile_context[:plugin_path_only]
+        return if plugin_path_only?
         add_config_path :template, path, absolute
       end
       
-      # Define a directory in which to find plugins
+      # Define a directory in which to find plugins. A call to this method will be ignored if the containing cogfile is itself being treated as a plugin.
       # @param path [String] a file system path
       # @param absolute [Boolean] if +false+, the path is relative to {Config::ProjectConfig#project_root}
       # @return [nil]
       def plugin_path(path, absolute=false)
+        return if plugin?
         path = add_config_path :plugin, path, absolute
         if path && File.exists?(path)
           raise Errors::PluginPathIsNotADirectory.new path unless File.directory?(path)
@@ -77,7 +78,7 @@ module Cog
       # @param map [Hash] key-value pairs from this mapping will override the default language map supplied by +cog+
       # @return [nil]
       def language_extensions(map)
-        return if @cogfile_context[:plugin_path_only]
+        return if plugin_path_only?
         config_eval do
           map.each_pair do |key, value|
             @language_extension_map[key.to_s.downcase] = value.to_s.downcase
@@ -90,7 +91,7 @@ module Cog
       # @yieldparam lang [LanguageDSL] an interface for defining the language
       # @return [Object] the return value of the block
       def language(key, &block)
-        return if @cogfile_context[:plugin_path_only]
+        return if plugin_path_only?
         dsl = LanguageDSL.new key
         r = block.call dsl
         lang = dsl.finalize
@@ -100,25 +101,43 @@ module Cog
         r
       end
 
-      # Register an autoload variable in the class {GeneratorSandbox}. That way when generators are run as instances of a sandbox, they will be able to load plugins just by referencing them using the provided +identifier_name+.
+      # Register an autoload variable in the class {GeneratorSandbox}. That way when generators are run as instances of a sandbox, they will be able to load plugins just by referencing them using the provided +identifier_name+. A call to this method will be ignored unless the containing cogfile is being treated as a plugin.
       # @param identifier_name [String] identifier by which the plugin can be referenced in generators
       # @param path [String] path to the ruby file to load when the identifier is referenced (relative to the cogfile)
       # @return [nil]
       def autoload_plugin(identifier_name, path)
-        GeneratorSandbox.autoload_plugin(identifier_name, File.join(@cogfile_context[:plugin].path, path))
+        if plugin?
+          GeneratorSandbox.autoload_plugin(identifier_name, File.join(plugin.path, path))
+        end
       end
       
-      # Define a block to call when stamping a generator for a plugin. A call to this method should only be used in plugin cogfiles.
+      # Define a block to call when stamping a generator for a plugin. A call to this method will be ignored unless the containing cogfile is being treated as a plugin.
       # @yieldparam name [String] name of the generator to stamp
       # @yieldparam dest [String] file system path where the file will be created
       # @yieldreturn [nil]
       # @return [nil]
       def stamp_generator(&block)
-        @cogfile_context[:plugin].stamp_generator_block = block
+        plugin.stamp_generator_block = block if plugin?
       end
       
       private
       
+      # @return [Plugin,nil] the plugin description
+      def plugin
+        @cogfile_context[:plugin]
+      end
+      
+      # @return [Boolean] is this a plugin cogfile?
+      def plugin?
+        !@cogfile_context[:plugin].nil?
+      end
+      
+      # @return [Boolean] should only the {#plugin_path} call be processed?
+      def plugin_path_only?
+        @cogfile_context[:plugin_path_only]
+      end
+      
+      # @return [String] path to the cogfile
       def cogfile_path
         @cogfile_context[:cogfile_path]
       end