Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a8c28306e2b5
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4cd110e6f610
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 30, 2016

  1. Copy the full SHA
    b9e94e9 View commit details
  2. Copy the full SHA
    4cd110e View commit details
Showing with 34 additions and 34 deletions.
  1. +32 −32 lib/ruby/truffle/cext/ruby.h
  2. +1 −1 truffle/src/main/c/cext/ruby.c
  3. +1 −1 truffle/src/main/ruby/core/truffle/cext.rb
64 changes: 32 additions & 32 deletions lib/ruby/truffle/cext/ruby.h
Original file line number Diff line number Diff line change
@@ -171,10 +171,10 @@ VALUE rb_jt_get_Qfalse(void);
VALUE rb_jt_get_Qtrue(void);
VALUE rb_jt_get_Qnil(void);

#define Qundef rb_jt_get_Qundef()
#define Qfalse rb_jt_get_Qfalse()
#define Qtrue rb_jt_get_Qtrue()
#define Qnil rb_jt_get_Qnil()
#define Qundef rb_jt_get_Qundef()
#define Qfalse rb_jt_get_Qfalse()
#define Qtrue rb_jt_get_Qtrue()
#define Qnil rb_jt_get_Qnil()

VALUE rb_jt_get_cObject(void);
VALUE rb_jt_get_cArray(void);
@@ -187,16 +187,16 @@ VALUE rb_jt_get_mWaitReadable(void);
VALUE rb_jt_get_mWaitWritable(void);
VALUE rb_jt_get_mComparable(void);

#define rb_cObject rb_jt_get_cObject()
#define rb_cArray rb_jt_get_cArray()
#define rb_cHash rb_jt_get_cHash()
#define rb_mKernel rb_jt_get_mKernel()
#define rb_cProc rb_jt_get_cProc()
#define rb_cTime rb_jt_get_cTime()
#define rb_mEnumerable rb_jt_get_mEnumerable()
#define rb_mWaitReadable rb_jt_get_mWaitReadable()
#define rb_mWaitWritable rb_jt_get_mWaitWritable()
#define rb_mComparable rb_jt_get_mComparable()
#define rb_cObject rb_jt_get_cObject()
#define rb_cArray rb_jt_get_cArray()
#define rb_cHash rb_jt_get_cHash()
#define rb_mKernel rb_jt_get_mKernel()
#define rb_cProc rb_jt_get_cProc()
#define rb_cTime rb_jt_get_cTime()
#define rb_mEnumerable rb_jt_get_mEnumerable()
#define rb_mWaitReadable rb_jt_get_mWaitReadable()
#define rb_mWaitWritable rb_jt_get_mWaitWritable()
#define rb_mComparable rb_jt_get_mComparable()

VALUE rb_jt_get_eException(void);
VALUE rb_jt_get_eRuntimeError(void);
@@ -207,14 +207,14 @@ VALUE rb_jt_get_eArgError(void);
VALUE rb_jt_get_eRangeError(void);
VALUE rb_jt_get_eNotImpError(void);

#define rb_eException rb_jt_get_eException()
#define rb_eRuntimeError rb_jt_get_eRuntimeError()
#define rb_eStandardError rb_jt_get_eStandardError()
#define rb_eNoMemError rb_jt_get_eNoMemError()
#define rb_eTypeError rb_jt_get_eTypeError()
#define rb_eArgError rb_jt_get_eArgError()
#define rb_eRangeError rb_jt_get_eRangeError()
#define rb_eNotImpError rb_jt_get_eNotImpError()
#define rb_eException rb_jt_get_eException()
#define rb_eRuntimeError rb_jt_get_eRuntimeError()
#define rb_eStandardError rb_jt_get_eStandardError()
#define rb_eNoMemError rb_jt_get_eNoMemError()
#define rb_eTypeError rb_jt_get_eTypeError()
#define rb_eArgError rb_jt_get_eArgError()
#define rb_eRangeError rb_jt_get_eRangeError()
#define rb_eNotImpError rb_jt_get_eNotImpError()

// Conversions

@@ -327,16 +327,16 @@ double RFLOAT_VALUE(VALUE value);

// String

#define PRI_VALUE_PREFIX "l"
#define PRI_LONG_PREFIX "l"
#define PRI_64_PREFIX PRI_LONG_PREFIX
#define RUBY_PRI_VALUE_MARK "\v"
#define PRIdVALUE PRI_VALUE_PREFIX"d"
#define PRIoVALUE PRI_VALUE_PREFIX"o"
#define PRIuVALUE PRI_VALUE_PREFIX"u"
#define PRIxVALUE PRI_VALUE_PREFIX"x"
#define PRIXVALUE PRI_VALUE_PREFIX"X"
#define PRIsVALUE PRI_VALUE_PREFIX"i" RUBY_PRI_VALUE_MARK
#define PRI_VALUE_PREFIX "l"
#define PRI_LONG_PREFIX "l"
#define PRI_64_PREFIX PRI_LONG_PREFIX
#define RUBY_PRI_VALUE_MARK "\v"
#define PRIdVALUE PRI_VALUE_PREFIX"d"
#define PRIoVALUE PRI_VALUE_PREFIX"o"
#define PRIuVALUE PRI_VALUE_PREFIX"u"
#define PRIxVALUE PRI_VALUE_PREFIX"x"
#define PRIXVALUE PRI_VALUE_PREFIX"X"
#define PRIsVALUE PRI_VALUE_PREFIX"i" RUBY_PRI_VALUE_MARK

char *RSTRING_PTR(VALUE string);
int rb_str_len(VALUE string);
2 changes: 1 addition & 1 deletion truffle/src/main/c/cext/ruby.c
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ VALUE rb_jt_obj_taint(VALUE object) {
}

bool rb_jt_obj_taintable_p(VALUE object) {
return truffle_invoke_b(RUBY_CEXT, "RB_OBJ_TAINTED", object);
return truffle_invoke_b(RUBY_CEXT, "RB_OBJ_TAINTABLE", object);
}

bool rb_jt_obj_tainted_p(VALUE object) {
2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/truffle/cext.rb
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ def RTEST(value)
!nil.equal?(value) && !false.equal?(value)
end

def RB_OBJ_TAINTED(object)
def RB_OBJ_TAINTABLE(object)
case object
when TrueClass, FalseClass, Fixnum, Float, NilClass, Symbol
true