Many more ops written, and it compiles. Nothing works yet.
This commit is contained in:
parent
f5f8e38b91
commit
c9f50572ab
17 changed files with 290 additions and 71 deletions
|
|
@ -16,6 +16,7 @@
|
|||
#include "memory/tags.h"
|
||||
|
||||
#include "payloads/cons.h"
|
||||
#include "payloads/function.h"
|
||||
#include "payloads/integer.h"
|
||||
#include "payloads/stack.h"
|
||||
#include "ops/stack_ops.h"
|
||||
|
|
@ -26,6 +27,8 @@
|
|||
*
|
||||
* Shallow, cheap equality.
|
||||
*
|
||||
* Bootstrap function: only knows about character, cons, integer, and
|
||||
* string-like-thing equality.
|
||||
* TODO: if either of these pointers points to a cache cell, then what
|
||||
* we need to check is the cached value, which is not so cheap. Ouch!
|
||||
*
|
||||
|
|
@ -53,8 +56,8 @@ bool c_equal( struct pso_pointer a, struct pso_pointer b ) {
|
|||
ob->payload.character.character );
|
||||
break;
|
||||
case CONSTV:
|
||||
result = ( c_equal( car( a ), car( b ) )
|
||||
&& c_equal( cdr( a ), cdr( b ) ) );
|
||||
result = ( c_equal( c_car( a ), c_car( b ) )
|
||||
&& c_equal( c_cdr( a ), c_cdr( b ) ) );
|
||||
break;
|
||||
case INTEGERTV:
|
||||
result = ( oa->payload.integer.value
|
||||
|
|
@ -63,11 +66,11 @@ bool c_equal( struct pso_pointer a, struct pso_pointer b ) {
|
|||
case KEYTV:
|
||||
case STRINGTV:
|
||||
case SYMBOLTV:
|
||||
while ( result == false && !nilp( a ) && !nilp( b ) ) {
|
||||
while ( !nilp( a ) && !nilp( b ) ) {
|
||||
if ( pointer_to_object( a )->payload.string.character ==
|
||||
pointer_to_object( b )->payload.string.character ) {
|
||||
a = cdr( a );
|
||||
b = cdr( b );
|
||||
a = c_cdr( a );
|
||||
b = c_cdr( b );
|
||||
}
|
||||
}
|
||||
result = nilp( a ) && nilp( b );
|
||||
|
|
@ -86,14 +89,17 @@ bool c_equal( struct pso_pointer a, struct pso_pointer b ) {
|
|||
*
|
||||
* * (eq? args...)
|
||||
*
|
||||
* @param frame my stack_frame.
|
||||
* @param frame_pointer a pointer to my stack_frame.
|
||||
* @param env my environment (ignored).
|
||||
* @return `t` if all args are pointers to the same object, else `nil`;
|
||||
*/
|
||||
struct pso_pointer eq( struct pso_pointer frame_pointer,
|
||||
struct pso_pointer env ) {
|
||||
struct pso_pointer eq(
|
||||
#ifndef MANAGED_POINTER_ONLY
|
||||
struct pso4 * frame,
|
||||
#endif
|
||||
struct pso_pointer frame_pointer, struct pso_pointer env) {
|
||||
#ifdef MANAGED_POINTER_ONLY
|
||||
struct pso4 *frame = pointer_to_pso4( frame_pointer );
|
||||
|
||||
#endif
|
||||
|
||||
struct pso_pointer result = t;
|
||||
|
||||
|
|
@ -108,3 +114,30 @@ struct pso_pointer eq( struct pso_pointer frame_pointer,
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Function; do all arguments to this finction point to the same object?
|
||||
*
|
||||
* Deep, expensive equality. Bootstrap version: only knows
|
||||
* * cons cells
|
||||
* * integers
|
||||
* * keywords
|
||||
* * symbols
|
||||
* * strings
|
||||
*
|
||||
* * (equal? arg1 qrg2)
|
||||
*
|
||||
* @return `t` if all args are pointers to the same object, else `nil`;
|
||||
*/
|
||||
struct pso_pointer equal(
|
||||
#ifndef MANAGED_POINTER_ONLY
|
||||
struct pso4 * frame,
|
||||
#endif
|
||||
struct pso_pointer frame_pointer, struct pso_pointer env) {
|
||||
#ifdef MANAGED_POINTER_ONLY
|
||||
struct pso4 *frame = pointer_to_pso4( frame_pointer );
|
||||
|
||||
#endif
|
||||
return c_equal( fetch_arg( frame, 0), fetch_arg( frame, 1)) ? t : nil;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue