New range type, distinct from cons cell.

* eval.c (eval_init): Register intrinsic functions rcons,
rangep from and to.
(eval_init): Register rangep intrinsic.

* gc.c (mark_obj): Traverse RNG objects.
(finalize): Handle RNG in switch.

* hash.c (equal_hash, eql_hash): Hashing for for RNG objects.

* lib.c (range_s, rcons_s): New symbol variables.
(code2type): Handle RNG type.
(eql, equal): Equality for ranges.
(less_tab_init): Table extended to cover RNG.
(less): Semantics defined for ranges.
(rcons, rangep, from, to): New functions.
(obj_init): range_s and rcons_s variables initialized.
(obj_print_impl): Produce #R notation for ranges.
(generic_funcall, dwim_set): Recognize range objects for indexing

* lib.h (enum type): New enum member, RNG.  MAXTYPE redefined
to RNG value.
(TYPE_SHIFT): Increased to 5 since there are now 16 type
codes.
(struct range): New struct type.
(union obj): New member rn, of type struct range.
(range_s, rcons_s, rcons, rangep, from, to): Declared.
(range_bind): New macro.

* parser.l (grammar): New rule for recognizing
the #R sequence as HASH_R token.

* parser.y (HASH_R): New terminal symbol.
(range): New nonterminal symbol.
(n_expr): Derives the new range symbol.
The n_expr DOTDOT n_expr rule produces rcons expression rather
than const.

* match.c (format_field): Recognize rcons syntax in fields
which is now what ranges translate to.  Also recognize range
object.

* tests/013/maze.tl (neigh): Fix code which destructures
range as a cons. That can't be done any more.

* txr.1: Document ranges.

1 files changed, 6 insertions, 0 deletions

diff --git a/hash.c b/hash.c
index 380a4615..265da1af 100644
--- a/hash.c
+++ b/hash.c
@@ -174,6 +174,9 @@ static cnum equal_hash(val obj)
     return hash_double(obj->fl.n);
   case COBJ:
     return obj->co.ops->hash(obj) & NUM_MAX;
+  case RNG:
+    return (equal_hash(obj->rn.from)
+            + 32 * (equal_hash(obj->rn.to) & (NUM_MAX / 16))) & NUM_MAX;
   }
 
   internal_error("unhandled case in equal function");
@@ -190,6 +193,9 @@ static cnum eql_hash(val obj)
       return mp_hash(mp(obj)) & NUM_MAX;
     case FLNUM:
       return hash_double(obj->fl.n);
+    case RNG:
+      return (eql_hash(obj->rn.from)
+              + 32 * (eql_hash(obj->rn.to) & (NUM_MAX / 16))) & NUM_MAX;
     default:
       switch (sizeof (mem_t *)) {
       case 4: