ruby2c 1.0.0.9 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: f6ae2f91c8e5c83ab77b02d6e779b83aa749f4fe8799c1f875859844c2d0f7a6
+  data.tar.gz: 145da4a50b73b15433695d7c1917412eb2da27ad8c954fc9c651ee71511a61e6
+SHA512:
+  metadata.gz: af6b9e49cf2b1eb2cf456fde6faa184a2dca2fc0ed61232206aeea83cb8a2b2512aa30164b0dba5ea58005cb16c68516ec695b3b00fd950f695607147b1df0d5
+  data.tar.gz: ad870dab2e1d50291e9855a53fae299c20733c11871d5de3f38da1341b82ed7e64dfd76d0d1d5e9c0fa700f2e52fdf87cb853e219f4f80d3ed20d51487b18e3e

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+F��L�fT�v��<h3ڬ~�VPrg�~}�0	Y;���<IX(?7��Z
+���#_�Q0���/��^��-��ys�F���;��I-8<`���u�݀�1��ty$��Epƨs1��X:����2��RQ��e�oԜ5�)%�r��p�N��RɞG�>�`.����N���Ls(��P�X-Ȫ(�n����i.q���Aj>HW�*�ZS��ȡ2n�X�'�;�g���jn��)A�'�!�;>ľc�,1i�(

data.tar.gz.sig

@@ -1 +1 @@
-���[�v@S��u��X)��0�����"Z�K4H,���!/�5�×с���|��� D�X0�F�Ӫ�����`"2���);p������C�bx�K�T�j�ȴ,����.Sn*�7���y���{�|5t�"��E��P'�'a����U���+�ʮ��sޖFl��4I�����B�[��qw�
_������
+lܮv��`����͉��G�I!������@8s�y_��a��@EOu`	�������=x�_!⏆��	��7�!r{�M�

data/History.txt

@@ -1,3 +1,21 @@
+=== 1.1.0 / 2019-09-24
+
+* 4 minor enhancements:
+
+  * Pushed @@array_types and array_type? up to Sexp (in typed_sexp.rb).
+  * Pushed down @@array_types and #array_type? from Sexp to TypedSexp.
+  * Renamed Type to CType
+  * Renamed TypedSexp#sexp_type to c_type to resolve conflict/confusion w/ Sexp.
+
+* 6 bug fixes:
+
+  * Fixed a test file randomization error (yay!) by requiring typed_sexp in rewriter.
+  * Fixed inspect/pretty_print to include line number for typed sexps, just like sexps.
+  * Fixed new ruby 2.5 warnings.
+  * Fixes for changes to sexp_processor, centered aroud maintaining c_type.
+  * Got working with ruby 2.5 parser.
+  * Removed obsolete attrset test
+
 === 1.0.0.9 / 2012-11-09
 
 * 1 bug fix:
@@ -29,12 +47,12 @@
 
 === 1.0.0.6 / 2009-06-23
 
-1 major enhancement:
+* 1 major enhancement:
 
   * Switched from ParseTree to ruby_parser for 1.9 compatibility. woo.
     * All translate/process methods are gone since we can't reflect at runtime.
 
-43 minor enhancements:
+* 43 minor enhancements:
 
   * Added IterRewriter for finding free variables in iter nodes.
   * Added dxstr.
@@ -99,104 +117,104 @@
 
 * 6 minor enhancements:
 
-    * Split RubyToC to RubyToRubyC and RubyToAnsiC.
-    * Extended Environment to be more flexible for various situations.
-    * Removed propaganda (bloat) from release.
-    * Gemified and reorganized things. Support still needs splitting up.
-    * Flipped a lot of internal naming to use Unique.
-    * Added ruby_to_c_show (like parse_tree_show).
+  * Split RubyToC to RubyToRubyC and RubyToAnsiC.
+  * Extended Environment to be more flexible for various situations.
+  * Removed propaganda (bloat) from release.
+  * Gemified and reorganized things. Support still needs splitting up.
+  * Flipped a lot of internal naming to use Unique.
+  * Added ruby_to_c_show (like parse_tree_show).
 
-* 4(ish) bug fixes:
+* 4 bug fixes:
 
-    * Use ivars instead of cvars so inheritance won't bugger the translator.
-    * Corrected unsupported node lists in pipeline.
-    * Fixed bugs for splat args, iters, optional args, method name map.
-    * Fixed many other bugs.
+  * Use ivars instead of cvars so inheritance won't bugger the translator.
+  * Corrected unsupported node lists in pipeline.
+  * Fixed bugs for splat args, iters, optional args, method name map.
+  * Fixed many other bugs.
 
 === 1.0.0-beta-4 / 2005-07-13
 
 * 1 minor enhancements:
 
-    * Added gemspec (hastily).
+  * Added gemspec (hastily).
 
 * 2 bug fixes:
 
-    * Translates bool type to VALUE since we were using Qtrue/Qfalse.
-    * Fixed rubygems for non-gem systems.
+  * Translates bool type to VALUE since we were using Qtrue/Qfalse.
+  * Fixed rubygems for non-gem systems.
 
 === 1.0.0-beta-3 / 2005-06-08
 
 * 16 minor enhancements:
 
-    * Added ivar and iasgn support. Needs more work.
-    * Added limited support for self.
-    * Added pipeline tests for bools, call_arglist, call_attrasgn, fbody.
-    * Added process_not to RubyToC.
-    * Added support for float and symbol literals.
-    * Added support for gasgn, cvasgn, const (class consts, not classes).
-    * Improved error handling/reporting, esp in RubyToC.
-    * In TypeChecker.boostrap, pre-registered all base classes.
-    * Modified process_class test to include a class const.
-    * Processing :class now adds class constants to the local var scope.
-    * Processing :const checks both genv and env now.
-    * Rearchitected all tests into a pipeline test class.
-    * Rewrite attrasgn into regular calls.
-    * Rewrite fbody into a regular defn.
-    * Rewrote :array inside call to :arglist.
-    * Rewrote :or nodes in process_case to correctly be binary.
+  * Added ivar and iasgn support. Needs more work.
+  * Added limited support for self.
+  * Added pipeline tests for bools, call_arglist, call_attrasgn, fbody.
+  * Added process_not to RubyToC.
+  * Added support for float and symbol literals.
+  * Added support for gasgn, cvasgn, const (class consts, not classes).
+  * Improved error handling/reporting, esp in RubyToC.
+  * In TypeChecker.boostrap, pre-registered all base classes.
+  * Modified process_class test to include a class const.
+  * Processing :class now adds class constants to the local var scope.
+  * Processing :const checks both genv and env now.
+  * Rearchitected all tests into a pipeline test class.
+  * Rewrite attrasgn into regular calls.
+  * Rewrite fbody into a regular defn.
+  * Rewrote :array inside call to :arglist.
+  * Rewrote :or nodes in process_case to correctly be binary.
 
 * 1 bug fix:
 
-    * Fixed a bug where single line while bodies were missing a semicolon.
+  * Fixed a bug where single line while bodies were missing a semicolon.
 
 === 1.0.0-beta-2 / 2005-02-15
 
 * 1 minor enhancement:
 
-    * Added post-condition while/until support and tests.
+  * Added post-condition while/until support and tests.
 
 * 4 bug fixes:
 
-    * Fixed bug:1422: Escape newlines to prevent multi-line strings in C.
-    * Fixed bug:1429: Arrays of strings are not being properly.
-    * Fixed bug:1447/1448: Readme file's website and added ParseTree dependency.
+  * Fixed bug:1422: Escape newlines to prevent multi-line strings in C.
+  * Fixed bug:1429: Arrays of strings are not being properly.
+  * Fixed bug:1447/1448: Readme file's website and added ParseTree dependency.
 
 === 1.0.0-beta-1 / 2005-02-01
 
 * 1 major enhancements:
 
-    * Hit 80% non-error conversion threshold for public beta release.
+  * Hit 80% non-error conversion threshold for public beta release.
 
 * 3 minor enhancements:
 
-    * (Mostly) Filled out functionality in Rewriter and TypeChecker.
-    * Flushed out what we don't do in RubyToC.
-    * Wrote a ton of rdoc
+  * (Mostly) Filled out functionality in Rewriter and TypeChecker.
+  * Flushed out what we don't do in RubyToC.
+  * Wrote a ton of rdoc
 
 === 1.0.0-a2 / 2004-12-31
 
 * 7 major enhancements:
 
-    * Alpha 2 released to private group for critique.
-    * Refactored and split out ParseTree package.
-    * Gemified dependency on ParseTree.
-    * Added iter rewriting
-    * Added post type inference rewriting specific to C library.
-    * Massive increase to the base we can translate.
-    * We have stabilized the architecture but still have a ways to go.
+  * Alpha 2 released to private group for critique.
+  * Refactored and split out ParseTree package.
+  * Gemified dependency on ParseTree.
+  * Added iter rewriting
+  * Added post type inference rewriting specific to C library.
+  * Massive increase to the base we can translate.
+  * We have stabilized the architecture but still have a ways to go.
 
 * 2 minor enhancements:
 
-    * Added propaganda (presentations).
-    * Much better test coverage, now with ZenTest compliant naming.
+  * Added propaganda (presentations).
+  * Much better test coverage, now with ZenTest compliant naming.
 
 * 2 bug fixes:
 
-    * Gem-proofed makefile.
-    * Tons of little fixes we didn't bother to track.
+  * Gem-proofed makefile.
+  * Tons of little fixes we didn't bother to track.
 
 === 1.0.0-a1 / 2004-09-24
 
 * 1 major enhancement:
 
-    * Birthday! Alpha 1 released to private group for critique.
+  * Birthday! Alpha 1 released to private group for critique.

data/README.txt

@@ -24,7 +24,7 @@ RubyToC has the following modules:
   
 * This is a preview release! BETA BETA BETA! Do NOT use this!
 
-== SYNOPSYS:
+== SYNOPSIS:
 
   require 'ruby_parser'
   require 'ruby_to_ruby_c'

data/Rakefile

@@ -19,4 +19,6 @@ Hoe.spec "ruby2c" do
   dependency "sexp_processor", "~> 4.1"
 end
 
+ENV["MT_NO_EXPECTATIONS"] = "1"
+
 # vim: syntax=ruby

data/lib/crewriter.rb

@@ -16,10 +16,10 @@ class CRewriter < SexpProcessor
   # generating the appropriate sexp for that rewriting.
 
   REWRITES = {
-    [Type.str, :+, Type.str] => proc { |l,n,r|
-      t(:call, nil, :strcat, r.unshift(r.shift, l), Type.str)
+    [CType.str, :+, CType.str] => proc { |l,n,r|
+      t(:call, nil, :strcat, r.unshift(r.shift, l), CType.str)
     },
-    [Type.file, :puts, Type.str] => proc { |l,n,r|
+    [CType.file, :puts, CType.str] => proc { |l,n,r|
       t(:call, nil, :fputs, r.push(l))
     },
   }
@@ -35,6 +35,18 @@ class CRewriter < SexpProcessor
     @extra_methods = []
   end
 
+  # def rewrite exp
+  #   result = super
+  #   result.c_type ||= exp.c_type if Sexp === exp and exp.c_type
+  #   result
+  # end
+
+  def process exp
+    result = super
+    result.c_type ||= exp.c_type if Sexp === exp and exp.c_type
+    result
+  end
+
   def free # REFACTOR: this is a violation of responsibility, should be in Env
     parent = @env.env[0..-2]
     bound_in_parent = parent.map { |h| h.keys }.flatten
@@ -57,14 +69,14 @@ class CRewriter < SexpProcessor
     name = exp.shift
     rhs = process exp.shift
 
-    lhs_type = lhs.sexp_type rescue nil
+    lhs_type = lhs.c_type rescue nil
     type_signature = [lhs_type, name]
-    type_signature += rhs[1..-1].map { |sexp| sexp.sexp_type } unless rhs.nil?
+    type_signature += rhs[1..-1].map { |sexp| sexp.c_type }.to_a unless rhs.nil?
 
     result = if REWRITES.has_key? type_signature then
                REWRITES[type_signature].call(lhs, name, rhs)
              else
-               t(:call, lhs, name, rhs, exp.sexp_type)
+               t(:call, lhs, name, rhs, exp.c_type)
              end
 
     return result
@@ -83,7 +95,7 @@ class CRewriter < SexpProcessor
     @extra_methods.reverse_each do |defx| methods.unshift defx end
     @extra_methods.clear
 
-    result = t(:class, klassname, superklassname, Type.zclass)
+    result = t(:class, klassname, superklassname, CType.zclass)
     result.push(*methods)
 
     return result
@@ -96,7 +108,7 @@ class CRewriter < SexpProcessor
     iter_method_name = Unique.next
 
     value_var_name = Unique.next
-    value_var_type = Type.unknown
+    value_var_type = CType.unknown
 
     memo_var_name = Unique.next
 
@@ -111,8 +123,8 @@ class CRewriter < SexpProcessor
 
     var_names = var_names_in vars
 
-    frees = t(:array, Type.void)
-    statics = t(:array, Type.void)
+    frees = t(:array, CType.void)
+    statics = t(:array, CType.void)
     defx_body_block = t(:block)
 
     # set statics first so block vars can update statics
@@ -132,7 +144,7 @@ class CRewriter < SexpProcessor
                            var_names.first.last)
 
     else # expand block args to masgn
-      value_var_type = Type.value
+      value_var_type = CType.value
       dyn_vars = t(:array)
 
       var_names.each do |name, type|
@@ -141,29 +153,29 @@ class CRewriter < SexpProcessor
 
       defx_body_block << t(:masgn,
                            dyn_vars,
-                           t(:to_ary, t(:lvar, value_var_name, Type.value)))
+                           t(:to_ary, t(:lvar, value_var_name, CType.value)))
     end
 
     defx_body_block << body
 
     free_vars.each do |name, static_name, type|
       defx_body_block << t(:lasgn, static_name, t(:lvar, name, type), type)
-      @extra_methods << t(:static, "static VALUE #{static_name};", Type.fucked)
+      @extra_methods << t(:static, "static VALUE #{static_name};", CType.fucked)
     end
 
-    defx_body_block << t(:return, t(:nil, Type.value))
+    defx_body_block << t(:return, t(:nil, CType.value))
 
     defx = t(:defx,
              iter_method_name,
              t(:args,
                t(value_var_name, value_var_type),
-               t(memo_var_name, Type.value)),
+               t(memo_var_name, CType.value)),
              t(:scope, defx_body_block),
-             Type.void)
+             CType.void)
 
     @extra_methods << defx
 
-    args = t(:args, frees, statics, Type.void)
+    args = t(:args, frees, statics, CType.void)
 
     return t(:iter, call, args, iter_method_name)
   end
@@ -172,27 +184,27 @@ class CRewriter < SexpProcessor
     name = exp.shift
     value = process(exp.shift)
 
-    @env.add name, exp.sexp_type
+    @env.add name, exp.c_type
     @env.set_val name, true
 
-    return t(:lasgn, name, value, exp.sexp_type)
+    return t(:lasgn, name, value, exp.c_type)
   end
 
   def process_lvar(exp)
     name = exp.shift
 
-    @env.add name, Type.value
+    @env.add name, CType.value
     @env.lookup name rescue @env.set_val name, false
 
-    return t(:lvar, name, exp.sexp_type)
+    return t(:lvar, name, exp.c_type)
   end
 
   def var_names_in(exp)
-    return [[exp.last, exp.sexp_type]] if exp.length == 2 and not Sexp === exp.last
+    return [[exp.last, exp.c_type]] if exp.length == 2 and not Sexp === exp.last
 
     var_names = []
     exp.each_of_type :dasgn_curr do |sexp|
-      var_names << [sexp.sexp_body.first, sexp.sexp_type]
+      var_names << [sexp.sexp_body.first, sexp.c_type]
     end
     return var_names
   end

data/lib/r2cenvironment.rb

@@ -10,8 +10,8 @@ class R2CEnvironment < RubyParserStuff::Environment
   def add(id, type, depth = 0)
     raise "Adding illegal identifier #{id.inspect}" unless
       Symbol === id
-    raise ArgumentError, "type must be a valid Type instance" unless
-      Type === type
+    raise ArgumentError, "type must be a valid Type instance: #{type.inspect}" unless
+      CType === type
 
     @env[depth][id.to_s.sub(/^\*/, '').intern][TYPE] = type
   end
@@ -31,7 +31,7 @@ class R2CEnvironment < RubyParserStuff::Environment
 
   def lookup(name)
     # HACK: if name is :self, cheat for now until we have full defn remapping
-    return Type.fucked if name == :self
+    return CType.fucked if name == :self
 
     return self._get(name)[TYPE]
   end

data/lib/rewriter.rb

@@ -1,9 +1,10 @@
-
 begin require 'rubygems'; rescue LoadError; end
 require 'sexp'
 require 'sexp_processor'
 require 'unique'
 
+require 'typed_sexp' # ensure @@array_types is defined
+
 class Sexp
   # add arglist because we introduce the new array type in this file
   @@array_types << :arglist
@@ -31,4 +32,3 @@ class Rewriter < SexpProcessor
     exp
   end
 end
-

data/lib/ruby_to_ansi_c.rb

@@ -20,7 +20,7 @@ require 'r2cenvironment'
 
 class RubyToAnsiC < SexpProcessor
 
-  VERSION = '1.0.0.9'
+  VERSION = '1.1.0'
 
   # TODO: remove me
   def no(exp) # :nodoc:
@@ -160,7 +160,7 @@ typedef char * str;
     until exp.empty? do
       arg = exp.shift
       name = arg.first.to_s.sub(/^\*/, '').intern
-      type = arg.sexp_type
+      type = arg.c_type
       @env.add name, type
       args << "#{self.class.c_type(type)} #{name}"
     end
@@ -212,10 +212,6 @@ typedef char * str;
     receiver = exp.shift
     name = exp.shift
 
-    receiver_type = Type.unknown
-    unless receiver.nil? then
-      receiver_type = receiver.sexp_type
-    end
     receiver = process receiver
 
     case name
@@ -304,7 +300,7 @@ typedef char * str;
 
   def process_dasgn_curr(exp) # TODO: audit against obfuscator
     var = exp.shift
-    @env.add var.to_sym, exp.sexp_type
+    @env.add var.to_sym, exp.c_type
     return var.to_s
   end
 
@@ -323,7 +319,7 @@ typedef char * str;
     name = name.to_s.sub(/(.*)\?$/, 'is_\1').intern
     args = process exp.shift
     body = process exp.shift
-    function_type = exp.sexp_type
+    function_type = exp.c_type
 
     ret_type = self.class.c_type function_type.list_type.return_type
 
@@ -351,7 +347,7 @@ typedef char * str;
 
   def process_dvar(exp)
     var = exp.shift
-    @env.add var.to_sym, exp.sexp_type
+    @env.add var.to_sym, exp.c_type
     return var.to_s
   end
 
@@ -378,7 +374,7 @@ typedef char * str;
 
   def process_gvar(exp)
     name = exp.shift
-    type = exp.sexp_type
+    type = exp.c_type
     case name
     when :$stderr then
       "stderr"
@@ -486,21 +482,21 @@ typedef char * str;
     arg_count = value.length - 1 if value.first == :array
     args = value
 
-    exp_type = exp.sexp_type
+    exp_type = exp.c_type
     @env.add var.to_sym, exp_type
 
     if exp_type.list? then
       assert_type args, :array
 
-      raise "array must be of one type" unless args.sexp_type == Type.homo
+      raise "array must be of one type" unless args.c_type == CType.homo
 
       # HACK: until we figure out properly what to do w/ zarray
       # before we know what its type is, we will default to long.
-      array_type = args.sexp_types.empty? ? 'void *' : self.class.c_type(args.sexp_types.first)
+      array_type = args.c_types.empty? ? 'void *' : self.class.c_type(args.c_types.first)
 
       args.shift # :arglist
 # TODO: look into alloca
-      out << "#{var} = (#{array_type}) malloc(sizeof(#{array_type}) * #{args.length});\n"
+      out << "#{var} = (#{array_type}) malloc(sizeof(#{array_type}) * #{arg_count});\n"
       args.each_with_index do |o,i|
         out << "#{var}[#{i}] = #{process o};\n"
       end
@@ -522,11 +518,11 @@ typedef char * str;
     # TODO what about floats and big numbers?
 
     value = exp.shift
-    sexp_type = exp.sexp_type
-    case sexp_type
-    when Type.long, Type.float then
+    c_type = exp.c_type
+    case c_type
+    when CType.long, CType.float then
       return value.to_s
-    when Type.symbol then
+    when CType.symbol then
       return value.to_s.inspect # HACK wrong! write test!
     else
       raise "Bug! no: Unknown literal #{value}:#{value.class}"