Skip to content

Commit

Permalink
First pass (only pass?) at removing runtime dependency on annotations.
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Nutter committed Feb 27, 2009
1 parent eca0f14 commit c857e3a
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 346 deletions.
14 changes: 14 additions & 0 deletions nbproject/project.xml
View file
Expand Up @@ -72,6 +72,12 @@
<location>lib/ruby/site_ruby</location>
<encoding>UTF-8</encoding>
</source-folder>
<source-folder>
<label>src_gen</label>
<type>java</type>
<location>src_gen</location>
<encoding>UTF-8</encoding>
</source-folder>
</folders>
<ide-actions>
<action name="build">
Expand Down Expand Up @@ -160,6 +166,10 @@
<label>lib/ruby/site_ruby</label>
<location>lib/ruby/site_ruby</location>
</source-folder>
<source-folder style="packages">
<label>src_gen</label>
<location>src_gen</location>
</source-folder>
<source-file>
<location>build.xml</location>
</source-file>
Expand Down Expand Up @@ -222,6 +232,10 @@
<package-root>lib/ruby/site_ruby</package-root>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>src_gen</package-root>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
</configuration>
</project>
76 changes: 37 additions & 39 deletions src/org/jruby/RubyBigDecimal.java
View file
Expand Up @@ -38,7 +38,6 @@
import java.util.regex.Pattern;

import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyConstant;
import org.jruby.anno.JRubyMethod;
import org.jruby.runtime.Arity;
import org.jruby.runtime.Block;
Expand All @@ -59,50 +58,27 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
}
};

@JRubyConstant
public final static int ROUND_DOWN = BigDecimal.ROUND_DOWN;
@JRubyConstant
public final static int ROUND_CEILING = BigDecimal.ROUND_CEILING;
@JRubyConstant
public final static int ROUND_UP = BigDecimal.ROUND_UP;
@JRubyConstant
public final static int ROUND_HALF_DOWN = BigDecimal.ROUND_HALF_DOWN;
@JRubyConstant
public final static int ROUND_HALF_EVEN = BigDecimal.ROUND_HALF_EVEN;
@JRubyConstant
public final static int ROUND_HALF_UP = BigDecimal.ROUND_HALF_UP;
@JRubyConstant
public final static int ROUND_FLOOR = BigDecimal.ROUND_FLOOR;

@JRubyConstant
public final static int SIGN_POSITIVE_INFINITE=3;
@JRubyConstant
public final static int EXCEPTION_OVERFLOW=1;
@JRubyConstant
public final static int SIGN_POSITIVE_ZERO=1;
@JRubyConstant
public final static int EXCEPTION_ALL=255;
@JRubyConstant
public final static int SIGN_NEGATIVE_FINITE=-2;
@JRubyConstant
public final static int EXCEPTION_UNDERFLOW=4;
@JRubyConstant
public final static int SIGN_NaN=0;
@JRubyConstant
public final static int BASE=10000;
@JRubyConstant
public final static int ROUND_MODE=256;
@JRubyConstant
public final static int SIGN_POSITIVE_FINITE=2;
@JRubyConstant
public final static int EXCEPTION_INFINITY=1;
@JRubyConstant
public final static int SIGN_NEGATIVE_INFINITE=-3;
@JRubyConstant
public final static int EXCEPTION_ZERODIVIDE=1;
@JRubyConstant
public final static int SIGN_NEGATIVE_ZERO=-1;
@JRubyConstant
public final static int SIGN_POSITIVE_INFINITE = 3;
public final static int EXCEPTION_OVERFLOW = 1;
public final static int SIGN_POSITIVE_ZERO = 1;
public final static int EXCEPTION_ALL = 255;
public final static int SIGN_NEGATIVE_FINITE = -2;
public final static int EXCEPTION_UNDERFLOW = 4;
public final static int SIGN_NaN = 0;
public final static int BASE = 10000;
public final static int ROUND_MODE = 256;
public final static int SIGN_POSITIVE_FINITE = 2;
public final static int EXCEPTION_INFINITY = 1;
public final static int SIGN_NEGATIVE_INFINITE = -3;
public final static int EXCEPTION_ZERODIVIDE = 1;
public final static int SIGN_NEGATIVE_ZERO = -1;
public final static int EXCEPTION_NaN=2;

// Static constants
Expand All @@ -121,7 +97,29 @@ public static RubyClass createBigDecimal(Ruby runtime) {
result.setInternalModuleVariable("vpRoundingMode", runtime.newFixnum(ROUND_HALF_UP));

result.defineAnnotatedMethods(RubyBigDecimal.class);
result.defineAnnotatedConstants(RubyBigDecimal.class);

result.defineConstant("ROUND_DOWN", RubyFixnum.newFixnum(runtime, ROUND_DOWN));
result.defineConstant("ROUND_CEILING", RubyFixnum.newFixnum(runtime, ROUND_CEILING));
result.defineConstant("ROUND_UP", RubyFixnum.newFixnum(runtime, ROUND_UP));
result.defineConstant("ROUND_HALF_DOWN", RubyFixnum.newFixnum(runtime, ROUND_HALF_DOWN));
result.defineConstant("ROUND_HALF_EVEN", RubyFixnum.newFixnum(runtime, ROUND_HALF_EVEN));
result.defineConstant("ROUND_HALF_UP", RubyFixnum.newFixnum(runtime, ROUND_HALF_UP));
result.defineConstant("ROUND_FLOOR", RubyFixnum.newFixnum(runtime, ROUND_FLOOR));
result.defineConstant("SIGN_POSITIVE_INFINITE", RubyFixnum.newFixnum(runtime, SIGN_POSITIVE_INFINITE));
result.defineConstant("EXCEPTION_OVERFLOW", RubyFixnum.newFixnum(runtime, EXCEPTION_OVERFLOW));
result.defineConstant("SIGN_POSITIVE_ZERO", RubyFixnum.newFixnum(runtime, SIGN_POSITIVE_ZERO));
result.defineConstant("EXCEPTION_ALL", RubyFixnum.newFixnum(runtime, EXCEPTION_ALL));
result.defineConstant("SIGN_NEGATIVE_FINITE", RubyFixnum.newFixnum(runtime, SIGN_NEGATIVE_FINITE));
result.defineConstant("EXCEPTION_UNDERFLOW", RubyFixnum.newFixnum(runtime, EXCEPTION_UNDERFLOW));
result.defineConstant("SIGN_NaN", RubyFixnum.newFixnum(runtime, SIGN_NaN));
result.defineConstant("BASE", RubyFixnum.newFixnum(runtime, BASE));
result.defineConstant("ROUND_MODE", RubyFixnum.newFixnum(runtime, ROUND_MODE));
result.defineConstant("SIGN_POSITIVE_FINITE", RubyFixnum.newFixnum(runtime, SIGN_POSITIVE_FINITE));
result.defineConstant("EXCEPTION_INFINITY", RubyFixnum.newFixnum(runtime, EXCEPTION_INFINITY));
result.defineConstant("SIGN_NEGATIVE_INFINITE", RubyFixnum.newFixnum(runtime, SIGN_NEGATIVE_INFINITE));
result.defineConstant("EXCEPTION_ZERODIVIDE", RubyFixnum.newFixnum(runtime, EXCEPTION_ZERODIVIDE));
result.defineConstant("SIGN_NEGATIVE_ZERO", RubyFixnum.newFixnum(runtime, SIGN_NEGATIVE_ZERO));
result.defineConstant("EXCEPTION_NaN", RubyFixnum.newFixnum(runtime, EXCEPTION_NaN));

return result;
}
Expand Down

0 comments on commit c857e3a

Please sign in to comment.