diff options
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/Database.cc | 5 | ||||
| -rw-r--r-- | src/rt/Lisp.cc | 14 | ||||
| -rw-r--r-- | src/rt/vm.cc | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/rt/Database.cc b/src/rt/Database.cc index ee620711..df6ec0a3 100644 --- a/src/rt/Database.cc +++ b/src/rt/Database.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013, Gabriel Dos Reis. +// Copyright (C) 2013-2014, Gabriel Dos Reis. // All rights reserved. // Written by Gabriel Dos Reis. // @@ -47,7 +47,8 @@ namespace OpenAxiom { auto x = reader.read(); auto offset = Lisp::retract_to_fixnum (Lisp::retract_to_pair(ctx.make_value(x))->head); - reader.position(offset); + auto n = FixnumBits(offset); + reader.position(n); toc = Lisp::retract_to_pair(ctx.make_value(reader.read())); } else if (auto data = Lisp::assoc(key, toc)) diff --git a/src/rt/Lisp.cc b/src/rt/Lisp.cc index 12684181..6f125bf7 100644 --- a/src/rt/Lisp.cc +++ b/src/rt/Lisp.cc @@ -77,17 +77,17 @@ namespace OpenAxiom { integer_too_large(const Sexpr::IntegerSyntax& x) { std::string s { x.lexeme().begin(), x.lexeme().end() }; throw IntegerOverflow{ s + " is too large for Fixnum; max value is " - + std::to_string(fixnum_maximum) }; + + std::to_string(FixnumBits(Fixnum::maximum)) }; } - constexpr auto fixmax_by_ten = fixnum_maximum / 10; - constexpr auto fixmax_lsd = fixnum_maximum % 10; + constexpr auto fixmax_by_ten = FixnumBits(Fixnum::maximum) / 10; + constexpr auto fixmax_lsd = FixnumBits(Fixnum::maximum) % 10; static Value construct(Evaluator* ctx, const Sexpr::IntegerSyntax& x) { bool neg = false; auto cur = x.lexeme().begin(); - Fixnum val = 0; + FixnumBits val = 0; switch (*cur) { case '-': neg = true; case '+': ++cur; @@ -102,12 +102,12 @@ namespace OpenAxiom { val = 10 * val + d; } if (neg) { - if (val > fixnum_maximum) + if (val > FixnumBits(Fixnum::maximum)) integer_too_large(x); val = -val; } } - return VM::from_fixnum(val); + return VM::from_fixnum(Fixnum(val)); } static Value @@ -250,7 +250,7 @@ namespace OpenAxiom { if (v == nil) os << "NIL"; else if (is_fixnum(v)) - os << to_fixnum(v); + os << FixnumBits(to_fixnum(v)); else if (auto p = to_pair_if_can(v)) format(p, os); else if (auto s = to_string_if_can(v)) diff --git a/src/rt/vm.cc b/src/rt/vm.cc index 2fe4da1c..a0f4f2e3 100644 --- a/src/rt/vm.cc +++ b/src/rt/vm.cc @@ -44,10 +44,10 @@ namespace OpenAxiom { Fixnum count_nodes(Pair p) { - Fixnum n = 1; + FixnumBits n = 1; for (; auto q = to_pair_if_can(p->tail); p = q) ++n; - return n; + return Fixnum(n); } // -- BasicContext -- |