suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some "Scheme" -> "Racket" changes and similar.

Browse Source
This commit is contained in:
Eli Barzilay 2011-10-12 04:51:55 -04:00
parent f882c01e65
commit 9ade64cc84
44 changed files with 168 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configure vendored
View File

@ -10244,7 +10244,7 @@ if test "${inplacebuild}" = "yes" ; then
else
echo ">>> Installation targets:"
echo " executables : ${bindir}/..."
echo " Scheme code : ${collectsdir}/..."
echo " Racket code : ${collectsdir}/..."
echo " core docs : ${docdir}/..."
echo " C libraries : ${libdir}/..."
echo " C headers : ${includepltdir}/..."

20
src/foreign/foreign.c
View File

@ -1078,7 +1078,7 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
/* (make-cstruct-type types [abi alignment]) -> ctype */
/* This creates a new primitive type that is a struct. This type can be used
* with cpointer objects, except that the contents is used rather than the
* pointer value. Marshaling to lists or whatever should be done in Scheme. */
* pointer value. Marshaling to lists or whatever should be done in Racket. */
#define MYNAME "make-cstruct-type"
static Scheme_Object *foreign_make_cstruct_type(int argc, Scheme_Object *argv[])
{
@ -1155,7 +1155,7 @@ static Scheme_Object *foreign_make_cstruct_type(int argc, Scheme_Object *argv[])
/* This creates a new primitive type that is an array. An array is the
* same as a cpointer as an argument, but it behave differently within
* a struct or for allocation. Marshaling to lists or whatever should
* be done in Scheme. */
* be done in Racket. */
#define MYNAME "make-array-type"
static Scheme_Object *foreign_make_array_type(int argc, Scheme_Object *argv[])
{
@ -1223,7 +1223,7 @@ static Scheme_Object *foreign_make_array_type(int argc, Scheme_Object *argv[])
/* (make-union-type type ...+) -> ctype */
/* This creates a new primitive type that is a union. All unions
* behave like structs. Marshaling to lists or whatever should
* be done in Scheme. */
* be done in Racket. */
#define MYNAME "make-union-type"
static Scheme_Object *foreign_make_union_type(int argc, Scheme_Object *argv[])
{
@ -2559,8 +2559,8 @@ static Scheme_Object *foreign_make_sized_byte_string(int argc, Scheme_Object *ar
}
#undef MYNAME
/* *** Calling Scheme code while the GC is working leads to subtle bugs, so
*** this is implemented now in Scheme using will executors. */
/* *** Calling Racket code while the GC is working leads to subtle bugs, so
*** this is implemented now in Racket using will executors. */
/* internal: apply Scheme finalizer */
void do_scm_finalizer(void *p, void *finalizer)
@ -2694,7 +2694,7 @@ Scheme_Object *ffi_do_call(void *data, int argc, Scheme_Object *argv[])
* overwritten, but from that point on it is all C code so there is no
* problem. Hopefully.
* (Things get complicated if the C call can involve GC (usually due to a
* Scheme callback), but then the programmer need to arrange for pointers
* Racket callback), but then the programmer need to arrange for pointers
* that cannot move. Because of all this, the *only* array that should not
* be ignored by the GC is avalues.)
*/
@ -2887,7 +2887,7 @@ static Scheme_Object *foreign_ffi_call(int argc, Scheme_Object *argv[])
#undef MYNAME
/*****************************************************************************/
/* Scheme callbacks */
/* Racket callbacks */
typedef void (*ffi_callback_t)(ffi_cif* cif, void* resultp, void** args, void *userdata);
@ -2943,7 +2943,7 @@ void ffi_do_callback(ffi_cif* cif, void* resultp, void** args, void *userdata)
#ifdef MZ_USE_MZRT
/* When OS-level thread support is avaiable, support callbacks
in foreign threads that are executed on the main Scheme thread. */
in foreign threads that are executed on the main Racket thread. */
typedef struct Queued_Callback {
ffi_cif* cif;
@ -3137,7 +3137,7 @@ static Scheme_Object *foreign_ffi_callback(int argc, Scheme_Object *argv[])
* problem is that memory that is GC-visible can move at any time. The
* solution is to use an immobile-box, which an immobile pointer (in a simple
* malloced block), which points to the ffi_callback_struct that contains the
* relevant Scheme call details. Another minor complexity is that an
* relevant Racket call details. Another minor complexity is that an
* immobile box serves as a reference for the GC, which means that nothing
* will ever get collected: and the solution for this is to stick a weak-box
* in the chain. Users need to be aware of GC issues, and need to keep a
@ -3158,7 +3158,7 @@ static Scheme_Object *foreign_ffi_callback(int argc, Scheme_Object *argv[])
* | : | |
* | : \--> ffi_callback_struct
* | : | |
* V : | \-----> Scheme Closure
* V : | \-----> Racket Closure
* cif ---> atypes : |
* : \--------> input/output types
*/

24
src/foreign/foreign.rktc
View File

@ -5,7 +5,7 @@ exec racket "$0" > `echo "$0" | sed 's/rktc$/c/'` "$0"
#lang scribble/text
@(require "rktc-utils.ss")
@(require "rktc-utils.rkt")
@header{foreign.rktc}
@ -496,7 +496,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf)
(cadr args))]
[else (loop (cddr args))])))
(let* ([stype (symbol->string type)]
[cname (scheme-id->c-name stype)]
[cname (racket-id->c-name stype)]
[ftype (prop 'ftype cname)]
[ctype (prop 'ctype
(regexp-replace
@ -911,7 +911,7 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
/* (make-cstruct-type types [abi alignment]) -> ctype */
/* This creates a new primitive type that is a struct. This type can be used
* with cpointer objects, except that the contents is used rather than the
* pointer value. Marshaling to lists or whatever should be done in Scheme. */
* pointer value. Marshaling to lists or whatever should be done in Racket. */
@cdefine[make-cstruct-type 1 3]{
Scheme_Object *p, *base;
/* since ffi_type objects can be used in callbacks, they are allocated using
@ -983,7 +983,7 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
/* This creates a new primitive type that is an array. An array is the
* same as a cpointer as an argument, but it behave differently within
* a struct or for allocation. Marshaling to lists or whatever should
* be done in Scheme. */
* be done in Racket. */
@cdefine[make-array-type 2 2]{
Scheme_Object *base, *basetype;
GC_CAN_IGNORE ffi_type *libffi_type, **elements;
@ -1046,7 +1046,7 @@ ffi_abi sym_to_abi(char *who, Scheme_Object *sym)
/* (make-union-type type ...+) -> ctype */
/* This creates a new primitive type that is a union. All unions
* behave like structs. Marshaling to lists or whatever should
* be done in Scheme. */
* be done in Racket. */
@cdefine[make-union-type 1 -1]{
Scheme_Object *base, *basetype;
GC_CAN_IGNORE ffi_type *libffi_type, **elements;
@ -1913,8 +1913,8 @@ static Scheme_Object *do_memop(const char *who, int mode,
len, 0);
}
/* *** Calling Scheme code while the GC is working leads to subtle bugs, so
*** this is implemented now in Scheme using will executors. */
/* *** Calling Racket code while the GC is working leads to subtle bugs, so
*** this is implemented now in Racket using will executors. */
/* internal: apply Scheme finalizer */
void do_scm_finalizer(void *p, void *finalizer)
@ -2049,7 +2049,7 @@ Scheme_Object *ffi_do_call(void *data, int argc, Scheme_Object *argv[])
* overwritten, but from that point on it is all C code so there is no
* problem. Hopefully.
* (Things get complicated if the C call can involve GC (usually due to a
* Scheme callback), but then the programmer need to arrange for pointers
* Racket callback), but then the programmer need to arrange for pointers
* that cannot move. Because of all this, the *only* array that should not
* be ignored by the GC is avalues.)
*/
@ -2239,7 +2239,7 @@ static Scheme_Object *ffi_name_prefix = NULL;
}
/*****************************************************************************/
/* Scheme callbacks */
/* Racket callbacks */
typedef void (*ffi_callback_t)(ffi_cif* cif, void* resultp, void** args, void *userdata);
@ -2295,7 +2295,7 @@ void ffi_do_callback(ffi_cif* cif, void* resultp, void** args, void *userdata)
#ifdef MZ_USE_MZRT
/* When OS-level thread support is avaiable, support callbacks
in foreign threads that are executed on the main Scheme thread. */
in foreign threads that are executed on the main Racket thread. */
typedef struct Queued_Callback {
ffi_cif* cif;
@ -2487,7 +2487,7 @@ void free_cl_cif_queue_args(void *ignored, void *p)
* problem is that memory that is GC-visible can move at any time. The
* solution is to use an immobile-box, which an immobile pointer (in a simple
* malloced block), which points to the ffi_callback_struct that contains the
* relevant Scheme call details. Another minor complexity is that an
* relevant Racket call details. Another minor complexity is that an
* immobile box serves as a reference for the GC, which means that nothing
* will ever get collected: and the solution for this is to stick a weak-box
* in the chain. Users need to be aware of GC issues, and need to keep a
@ -2508,7 +2508,7 @@ void free_cl_cif_queue_args(void *ignored, void *p)
* | : | |
* | : \--> ffi_callback_struct
* | : | |
* V : | \-----> Scheme Closure
* V : | \-----> Racket Closure
* cif ---> atypes : |
* : \--------> input/output types
*/

6
src/foreign/rktc-utils.rkt
View File

@ -35,8 +35,8 @@
(define (DEFINE . t) @list{@disable-prefix{#}define @t})
(define (UNDEF . t) @list{@disable-prefix{#}undef @t})
(provide scheme-id->c-name)
(define (scheme-id->c-name str)
(provide racket-id->c-name)
(define (racket-id->c-name str)
(set! str (format "~a" str))
(for ([subst '([#rx"->" "_to_"] [#rx"[-/]" "_"] [#rx"\\*" "S"]
[#rx"\\?$" "_p"] [#rx"!$" "_bang"])])
@ -51,7 +51,7 @@
(provide cfunctions)
(define cfunctions (make-parameter '()))
(define (_cdefine name minargs maxargs . body)
(define cname @list{foreign_@(scheme-id->c-name name)})
(define cname @list{foreign_@(racket-id->c-name name)})
(cfunctions (cons (list name cname minargs maxargs) (cfunctions)))
@list{@disable-prefix{#define MYNAME "@name"}
static Scheme_Object *@|cname|(int argc, Scheme_Object *argv[])

5
src/mac/install-libs.rkt
View File

@ -2,7 +2,10 @@
(require racket/system)
(define from (vector-ref (current-command-line-arguments) 0))
(define to (path->string (simplify-path (build-path (collection-path "scheme") 'up 'up "lib/") #f)))
(define to
(path->string (simplify-path (build-path (collection-path "racket")
'up 'up "lib/")
#f)))
(define libs
'("libgio-2.0.0"

2
src/mac/osx_appl.rkt
View File

@ -10,7 +10,7 @@
(module osx_appl mzscheme
(require (lib "plist.ss" "xml")
(require (lib "plist.rkt" "xml")
mzlib/process
mzlib/file)

8
src/mysterx/array.cxx
View File

@ -1,7 +1,7 @@
// array.cxx
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/array3m.cxx"
#else
@ -135,7 +135,7 @@ Scheme_Object *safeArrayElementToSchemeObject(SAFEARRAY *theArray,
default :
sprintf(errBuff,
"Can't make Scheme value from array element with type 0x%X",
"Can't make Racket value from array element with type 0x%X",
vt);
scheme_signal_error(errBuff);
@ -312,7 +312,7 @@ void* variantDataPointer(VARTYPE vt,VARIANTARG *pVariantArg)
scheme_signal_error("unable to marshal VT_PTR");
break;
default :
sprintf(errBuff, "Unable to marshal Scheme value into VARIANT: 0x%X",
sprintf(errBuff, "Unable to marshal Racket value into VARIANT: 0x%X",
pVariantArg->vt);
scheme_signal_error(errBuff);
}
@ -339,7 +339,7 @@ VARTYPE schemeValueToCOMType(Scheme_Object* val)
else if (MX_IUNKNOWNP(val)) return VT_UNKNOWN;
else if (SCHEME_VECTORP(val)) return getSchemeVectorType(val);
else
scheme_signal_error("Unable to inject Scheme value %V into VARIANT", val);
scheme_signal_error("Unable to inject Racket value %V into VARIANT", val);
return VT_VARIANT;
}

140
src/mysterx/bridge.cs
View File

@ -23,7 +23,7 @@ namespace SchemeBridge
// .NET methods like GetType() or ToString() won't work.
// The BridgeWrapper object, being a bona fide .NET object
// will have those methods. The Scheme interface knows about
// will have those methods. The Racket interface knows about
// BridgeWrappers specially and presents the illusion that
// they aren't there.
@ -1961,8 +1961,8 @@ public class GUIHelper {
//
// In order to behave like an official .NET GUI object, you have to
// inherit from the .NET GUI hierarchy. I can't create one of these
// objects from Scheme, so I have to create it here and use this as a
// proxy object back to Scheme.
// objects from Racket, so I have to create it here and use this as a
// proxy object back to Racket.
/////////////////////////////////////
public unsafe class ControlProxy : System.Windows.Forms.Control
@ -1980,7 +1980,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2011,7 +2011,7 @@ public class GUIHelper {
Marshal.WriteIntPtr (buffer, 12, scheme_control.MarshalManagedToNative (e.Delta));
Marshal.WriteIntPtr (buffer, 16, scheme_control.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 20, scheme_control.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 6, buffer);
}
@ -2027,7 +2027,7 @@ public class GUIHelper {
buffer = Marshal.AllocCoTaskMem (8);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
Marshal.WriteIntPtr (buffer, 4, scheme_control.MarshalManagedToNative (e.Cancel));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 2, buffer);
}
@ -2042,7 +2042,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2059,7 +2059,7 @@ public class GUIHelper {
// other things go here
Marshal.WriteIntPtr (buffer, 8, scheme_control.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 12, scheme_control.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 3, buffer);
}
finally {
@ -2073,7 +2073,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2087,7 +2087,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2101,7 +2101,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2115,7 +2115,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2129,7 +2129,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2143,7 +2143,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2157,7 +2157,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2171,7 +2171,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2188,7 +2188,7 @@ public class GUIHelper {
Marshal.WriteIntPtr (buffer, 4, scheme_control.MarshalManagedToNative (e.HelpKeyword));
Marshal.WriteIntPtr (buffer, 8, scheme_control.MarshalManagedToNative (e.HelpNamespace));
Marshal.WriteIntPtr (buffer, 12, scheme_control.MarshalManagedToNative (e.HelpString));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 4, buffer);
}
finally {
@ -2202,7 +2202,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2216,7 +2216,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2230,7 +2230,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_control.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_control, 1, buffer);
}
finally {
@ -2661,7 +2661,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2692,7 +2692,7 @@ public class GUIHelper {
Marshal.WriteIntPtr (buffer, 12, scheme_form.MarshalManagedToNative (e.Delta));
Marshal.WriteIntPtr (buffer, 16, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 20, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 6, buffer);
}
finally {
@ -2707,7 +2707,7 @@ public class GUIHelper {
buffer = Marshal.AllocCoTaskMem (8);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.Cancel));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 2, buffer);
}
finally {
@ -2721,7 +2721,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2738,7 +2738,7 @@ public class GUIHelper {
// other things go here
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 8, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 3, buffer);
}
finally {
@ -2752,7 +2752,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2766,7 +2766,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2780,7 +2780,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2794,7 +2794,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2808,7 +2808,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2822,7 +2822,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2836,7 +2836,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2850,7 +2850,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2864,7 +2864,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2878,7 +2878,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -2892,7 +2892,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3318,7 +3318,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3349,7 +3349,7 @@ public class GUIHelper {
Marshal.WriteIntPtr (buffer, 12, scheme_form.MarshalManagedToNative (e.Delta));
Marshal.WriteIntPtr (buffer, 16, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 20, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 6, buffer);
}
finally {
@ -3364,7 +3364,7 @@ public class GUIHelper {
buffer = Marshal.AllocCoTaskMem (8);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.Cancel));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 2, buffer);
}
finally {
@ -3378,7 +3378,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3395,7 +3395,7 @@ public class GUIHelper {
// other things go here
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 8, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 3, buffer);
}
finally {
@ -3409,7 +3409,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3423,7 +3423,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3437,7 +3437,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3451,7 +3451,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3465,7 +3465,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3479,7 +3479,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3493,7 +3493,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3507,7 +3507,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3521,7 +3521,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3535,7 +3535,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -3549,7 +3549,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4058,7 +4058,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4097,7 +4097,7 @@ public class GUIHelper {
Marshal.WriteIntPtr (buffer, 12, scheme_form.MarshalManagedToNative (e.Delta));
Marshal.WriteIntPtr (buffer, 16, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 20, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 6, buffer);
}
finally {
@ -4116,7 +4116,7 @@ public class GUIHelper {
buffer = Marshal.AllocCoTaskMem (8);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.Cancel));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 2, buffer);
}
finally {
@ -4134,7 +4134,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4152,7 +4152,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4173,7 +4173,7 @@ public class GUIHelper {
// other things go here
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.X));
Marshal.WriteIntPtr (buffer, 8, scheme_form.MarshalManagedToNative (e.Y));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 3, buffer);
}
finally {
@ -4191,7 +4191,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4209,7 +4209,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4227,7 +4227,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4245,7 +4245,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4263,7 +4263,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4281,7 +4281,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4299,7 +4299,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4317,7 +4317,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4336,7 +4336,7 @@ public class GUIHelper {
buffer = Marshal.AllocCoTaskMem (8);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
Marshal.WriteIntPtr (buffer, 4, scheme_form.MarshalManagedToNative (e.LinkText));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 2, buffer);
}
finally {
@ -4354,7 +4354,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4372,7 +4372,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {
@ -4390,7 +4390,7 @@ public class GUIHelper {
try {
buffer = Marshal.AllocCoTaskMem (4);
Marshal.WriteIntPtr (buffer, 0, scheme_form.MarshalManagedToNative (event_name));
// Console.WriteLine ("Notify scheme of " + event_name);
// Console.WriteLine ("Notify racket of " + event_name);
Scheme.scheme_apply (scheme_form, 1, buffer);
}
finally {

2
src/mysterx/browser.cxx
View File

@ -1,7 +1,7 @@
// browser.cxx
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/browser3m.cxx"
#else

2
src/mysterx/bstr.cxx
View File

@ -1,7 +1,7 @@
// bstr.cxx -- BSTR utility functions
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/bstr3m.cxx"
#else

2
src/mysterx/comtypes.cxx
View File

@ -1,7 +1,7 @@
// comtypes.cxx
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/comtypes3m.cxx"
#else

2
src/mysterx/gc-trav.rkt
View File

@ -1,6 +1,6 @@
#lang scheme/base
(printf "/* Generated from gc-trav.ss */\n\n")
(printf "/* Generated from gc-trav.rkt */\n\n")
(define types
'([mx_com_object_type MX_COM_Object (types)]

2
src/mysterx/htmlevent.cxx
View File

@ -1,7 +1,7 @@
// event.cpp -- event-related functions
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/htmlevent3m.cxx"
#else

2
src/mysterx/htmlutil.cxx
View File

@ -1,7 +1,7 @@
// htmlutil.cxx
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# include "xsrc/htmlutil3m.cxx"
#else

2
src/mysterx/myssink/sink.cxx
View File

@ -242,7 +242,7 @@ HRESULT CSink::Invoke(DISPID dispId, REFIID, LCID, WORD,
---------------------------------
these are in reverse order from the order
given to Scheme
given to Racket
*/

28
src/mysterx/mysterx.cxx
View File

@ -1,8 +1,8 @@
// mysterx.cxx : COM/ActiveX/DHTML extension for PLT Scheme
// mysterx.cxx : COM/ActiveX/DHTML extension for Racket
// Author: Paul Steckler
#ifdef MYSTERX_3M
// Created by xform.ss:
// Created by xform.rkt:
# define i64 /* ??? why does expansion produce i64? */
# include "xsrc/mysterx3m.cxx"
#else
@ -2630,7 +2630,7 @@ BOOL schemeValueFitsVarType(Scheme_Object *val, VARTYPE vt)
return MX_DATEP(val);
case VT_BOOL :
return TRUE; // ain't Scheme great
return TRUE; // ain't Racket great
case VT_ERROR :
return MX_SCODEP(val);
@ -2863,7 +2863,7 @@ void marshalSchemeValueToVariant(Scheme_Object *val, VARIANTARG *pVariantArg)
}
else
scheme_signal_error("Unable to inject Scheme value %V into VARIANT", val);
scheme_signal_error("Unable to inject Racket value %V into VARIANT", val);
return;
}
@ -3110,7 +3110,7 @@ void marshalSchemeValue(Scheme_Object *val, VARIANTARG *pVariantArg)
break;
default :
sprintf(errBuff, "Unable to marshal Scheme value into VARIANT: 0x%X",
sprintf(errBuff, "Unable to marshal Racket value into VARIANT: 0x%X",
pVariantArg->vt);
scheme_signal_error(errBuff);
}
@ -3191,7 +3191,7 @@ Scheme_Object *variantToSchemeObject(VARIANTARG *pVariantArg)
return mx_make_iunknown(pVariantArg->punkVal);
default :
sprintf(errBuff, "Can't make Scheme value from VARIANT 0x%X",
sprintf(errBuff, "Can't make Racket value from VARIANT 0x%X",
pVariantArg->vt);
scheme_signal_error(errBuff);
@ -3202,7 +3202,7 @@ Scheme_Object *variantToSchemeObject(VARIANTARG *pVariantArg)
// different than the above function.
// *here* we're coercing VARIANTARG's to be arguments to
// Scheme procedures; *there*, we're coercing a VARIANT
// Racket procedures; *there*, we're coercing a VARIANT
// return value to be the value of a method call, and
// VARIANT's, unlike VARIANTARG's, cannot have VT_BYREF bit
@ -3333,7 +3333,7 @@ Scheme_Object *variantArgToSchemeObject(VARIANTARG *pVariantArg) {
return scheme_box(variantArgToSchemeObject(pVariantArg->pvarVal));
default :
wsprintf(errBuff, "Can't make Scheme value from VARIANT 0x%X",
wsprintf(errBuff, "Can't make Racket value from VARIANT 0x%X",
pVariantArg->vt);
scheme_signal_error(errBuff);
}
@ -3427,7 +3427,7 @@ void unmarshalArgSchemeObject(Scheme_Object *obj,VARIANTARG *pVariantArg) {
case VT_BSTR :
// string passed to Scheme can be updated in-place
// string passed to Racket can be updated in-place
BSTR bstr;
@ -3725,7 +3725,7 @@ void unmarshalVariant(Scheme_Object *val, VARIANTARG *pVariantArg)
}
// Build the DISPPARAMS by filling out the fields
// according to the Scheme type of object.
// according to the Racket type of object.
// No optional or named args, no type checking.
short int buildMethodArgumentsUsingDefaults(INVOKEKIND invKind,
int argc, Scheme_Object **argv,
@ -3774,7 +3774,7 @@ short int buildMethodArgumentsUsingDefaults(INVOKEKIND invKind,
methodArguments->rgvarg = va;
}
// marshal Scheme argument list into COM argument list
// marshal Racket argument list into COM argument list
// arguments are in reverse order in rgvarg
for (i = 0, j = numParamsPassed - 1, k = 2; i < argc - 2; i++, j--, k++) {
@ -3955,7 +3955,7 @@ short int buildMethodArgumentsUsingFuncDesc(FUNCDESC *pFuncDesc,
methodArguments->rgvarg = va;
}
// marshal Scheme argument list into COM argument list
// marshal Racket argument list into COM argument list
// arguments are in reverse order in rgvarg
for (i = 0, j = numParamsPassed - 1, k = 2; i < argc - 2; i++, j--, k++) {
@ -4069,7 +4069,7 @@ short int buildMethodArgumentsUsingVarDesc(VARDESC *pVarDesc,
methodArguments->rgvarg = va;
}
// marshal Scheme argument list into COM argument list
// marshal Racket argument list into COM argument list
for (i = 0, j = numParamsPassed - 1, k = 2; i < numParamsPassed; i++, j--, k++) {
@ -5342,7 +5342,7 @@ Scheme_Object *scheme_reload(Scheme_Env *env)
if (0 && isatty(fileno(stdin))) {
fprintf(stderr,
"MysterX extension for PLT Scheme, "
"MysterX extension for Racket, "
"Copyright (c) 1999-2003 PLT (Paul Steckler)\n");
}

6
src/mzcom/mzobj.cxx
View File

@ -1,7 +1,7 @@
// mzobj.cxx : Implementation of CMzObj
#ifdef MZCOM_3M
/* xform.ss converts this file to mzobj3m.cxx: */
/* xform.rkt converts this file to mzobj3m.cxx: */
# define i64 /* ??? why does expansion produce i64? */
# include "mzobj3m.cxx"
#else
@ -145,7 +145,7 @@ void setupSchemeEnv(Scheme_Env *in_env)
env = in_env;
if (env == NULL) {
ErrorBox("Can't create Scheme environment");
ErrorBox("Can't create Racket environment");
_endthreadex(0);
}
@ -481,7 +481,7 @@ STDMETHODIMP CMzObj::Eval(BSTR input, BSTR *output) {
// wait until evaluator done or eval thread terminated
if (WaitForMultipleObjects(2,evalDoneSems,FALSE,INFINITE) ==
WAIT_OBJECT_0 + 1) {
RaiseError(L"Scheme terminated evaluator");
RaiseError(L"Racket terminated evaluator");
return E_FAIL;
}

2
src/racket/configure.ac
View File

@ -1306,7 +1306,7 @@ if test "${inplacebuild}" = "yes" ; then
else
echo ">>> Installation targets:"
echo " executables : ${bindir}/..."
echo " Scheme code : ${collectsdir}/..."
echo " Racket code : ${collectsdir}/..."
echo " core docs : ${docdir}/..."
echo " C libraries : ${libdir}/..."
echo " C headers : ${includepltdir}/..."

2
src/racket/gc/Makefile.direct
View File

@ -216,7 +216,7 @@ HOSTCFLAGS=$(CFLAGS)
# the headers to minimize object size, at the expense of checking for
# writes past the end of an object. This is intended for environments
# in which most client code is written in a "safe" language, such as
# Scheme or Java. Assumes that all client allocation is done using
# Racket or Java. Assumes that all client allocation is done using
# the GC_debug_ functions, or through the macros that expand to these,
# or by redirecting malloc to GC_debug_malloc_replacement.
# (Also eliminates the field for the requested object size.)

2
src/racket/gc/Makefile.dj
View File

@ -123,7 +123,7 @@ CFLAGS= -gstabs+ -O2 -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DALL_INTERIOR_P
# the headers to minimize object size, at the expense of checking for
# writes past the end of an object. This is intended for environments
# in which most client code is written in a "safe" language, such as
# Scheme or Java. Assumes that all client allocation is done using
# Racket or Java. Assumes that all client allocation is done using
# the GC_debug_ functions (or through the macros that expand to these.
# (Also eliminates the field for the requested object size.)
# occasionally be useful for debugging of client code. Slows down the

2
src/racket/gc/Makefile.in
View File

@ -219,7 +219,7 @@ HOSTCFLAGS=$(BASEFLAGS)
# the headers to minimize object size, at the expense of checking for
# writes past the end of an object. This is intended for environments
# in which most client code is written in a "safe" language, such as
# Scheme or Java. Assumes that all client allocation is done using
# Racket or Java. Assumes that all client allocation is done using
# the GC_debug_ functions, or through the macros that expand to these,
# or by redirecting malloc to GC_debug_malloc_replacement.
# (Also eliminates the field for the requested object size.)

2
src/racket/mk-gdbinit.rkt
View File

@ -11,7 +11,7 @@
;; can't see them. If "stypes.h" changes, then "mz-gdbinit" needs
;; to be re-built.
(require scheme/runtime-path)
(require racket/runtime-path)
(define-runtime-path stypes-path "src/stypes.h")

2
src/racket/src/builtin.c
View File

@ -26,7 +26,7 @@
#include "schpriv.h"
#include "schminc.h"
/* On the Mac, 68K, store the built-in Scheme code as pc-relative */
/* On the Mac, 68K, store the built-in Racket code as pc-relative */
#if defined(__MWERKS__)
#if !defined(__POWERPC__)
#pragma pcrelstrings on

2
src/racket/src/env.c
View File

@ -1433,7 +1433,7 @@ const char *scheme_look_for_primitive(void *code)
}
/*========================================================================*/
/* run-time and expansion-time Scheme interface */
/* run-time and expansion-time Racket interface */
/*========================================================================*/
static Scheme_Object *

4
src/racket/src/eval.c
View File

@ -103,7 +103,7 @@
The fourth pass, "sfs", performs another liveness analysis on stack
slots and inserts operations to clear stack slots as necessary to
make execution safe for space. In particular, dead slots need to be
cleared before a non-tail call into arbitrary Scheme code. This pass
cleared before a non-tail call into arbitrary Racket code. This pass
can mutate the result of the "resolve" pass. See "sfs.c".
Bytecode marshaling and validation:
@ -1469,7 +1469,7 @@ Scheme_Object *scheme_jump_to_continuation(Scheme_Object *obj, int num_rands, Sc
MZ_RUNSTACK = old_runstack;
return scheme_compose_continuation(c, num_rands, value);
} else {
/* Aborting (Scheme-style) continuation. */
/* Aborting (Racket-style) continuation. */
int orig_cac = scheme_continuation_application_count;
scheme_about_to_move_C_stack();

2
src/racket/src/fun.c
View File

@ -7839,7 +7839,7 @@ Scheme_Object *scheme_dynamic_wind(void (*pre)(void *),
continuation was composed */
p->next_meta += delta;
/* Don't run Scheme-based dyn-winds when we're killing a nested thread. */
/* Don't run Racket-based dyn-winds when we're killing a nested thread. */
if (err && p->cjs.is_kill && (post == post_dyn_wind))
post = NULL;

8
src/racket/src/future.c
View File

@ -105,7 +105,7 @@ static Scheme_Object *touch(int argc, Scheme_Object *argv[])
mz_jmp_buf newbuf, * volatile savebuf;
Scheme_Thread *p = scheme_current_thread;
/* In case another Scheme thread touches the future. */
/* In case another Racket thread touches the future. */
sema = scheme_make_sema(0);
ft->running_sema = sema;
@ -1545,7 +1545,7 @@ Scheme_Object *scheme_fsemaphore_try_wait(int argc, Scheme_Object **argv)
}
static int fsemaphore_ready(Scheme_Object *obj)
/* Called in runtime thread by Scheme scheduler */
/* Called in runtime thread by Racket scheduler */
{
int ret = 0;
fsemaphore_t *fsema = (fsemaphore_t*)obj;
@ -1557,7 +1557,7 @@ static int fsemaphore_ready(Scheme_Object *obj)
int future_ready(Scheme_Object *obj)
/* Called in runtime thread by Scheme scheduler */
/* Called in runtime thread by Racket scheduler */
{
Scheme_Future_State *fs = scheme_future_state;
int ret = 0;
@ -2226,7 +2226,7 @@ void scheme_check_future_work()
/* Called in the runtime thread by the scheduler */
{
/* Check for work that future threads need from the runtime thread
and that can be done in any Scheme thread (e.g., get a new page
and that can be done in any Racket thread (e.g., get a new page
for allocation). */
future_t *ft, *other_ft;
Scheme_Future_State *fs = scheme_future_state;

2
src/racket/src/gmp/gmp-impl.h
View File

@ -94,7 +94,7 @@ MA 02111-1307, USA.
#define HAVE_ALLOCA
#endif
/* PLT Scheme: we turn off alloca to avoid stack-overflow issues. */
/* Racket: we turn off alloca to avoid stack-overflow issues. */
#undef HAVE_ALLOCA
#if ! defined (HAVE_ALLOCA) || USE_STACK_ALLOC

4
src/racket/src/hash.c
View File

@ -1791,7 +1791,7 @@ intptr_t scheme_recur_equal_hash_key2(Scheme_Object *o, void *cycle_data)
/*========================================================================*/
/* Direct port of red-black trees in Jens Axel Soegaard's "galore" package,
which implemented in Scheme (5th may 2006 version) and says:
which implemented in Racket (5th may 2006 version) and says:
; This is direct port of Jean-Christophe Filliatre's implementation
; of red-black trees in Ocaml. */
@ -2158,7 +2158,7 @@ static RBNode *remove_min(RBNode *s, RBNode **_m, int *_bh_dec)
*_m = s;
return s->right;
}
/* covers last two cases of Scheme code: */
/* covers last two cases of Racket code: */
{
int left_bh_dec;
RBNode *l1, *t;

2
src/racket/src/jit.h
View File

@ -624,7 +624,7 @@ int check_location;
circumstances:
* They can only be used within a function (normally corresponding
to a Scheme lambda) where mz_push_locals() has been called after
to a Racket lambda) where mz_push_locals() has been called after
jit_prolog(), and where mz_pop_locals() is called before
jit_ret().

4
src/racket/src/network.c
View File

@ -1574,7 +1574,7 @@ make_tcp_output_port(void *data, const char *name, Scheme_Object *cust)
#endif /* USE_TCP */
/*========================================================================*/
/* TCP Scheme interface */
/* TCP Racket interface */
/*========================================================================*/
#ifdef USE_SOCKETS_TCP
@ -2451,7 +2451,7 @@ static Scheme_Object *tcp_abandon_port(int argc, Scheme_Object *argv[])
return scheme_void;
}
} else if (SCHEME_INPUT_PORTP(argv[0])) {
/* Abandon is not really useful on input ports from the Schemer's
/* Abandon is not really useful on input ports from the Racketeer's
perspective, but it's here for completeness. */
Scheme_Input_Port *ip;
ip = scheme_input_port_record(argv[0]);

2
src/racket/src/numstr.c
View File

@ -1421,7 +1421,7 @@ Scheme_Object *scheme_read_number(const mzchar *str, intptr_t len,
}
/*========================================================================*/
/* scheme functions */
/* Racket functions */
/*========================================================================*/
static Scheme_Object *

4
src/racket/src/port.c
View File

@ -1546,7 +1546,7 @@ static int output_ready(Scheme_Object *port, Scheme_Schedule_Info *sinfo)
return 1;
if (SAME_OBJ(scheme_user_output_port_type, op->sub_type)) {
/* We can't call the normal ready because that might run Scheme
/* We can't call the normal ready because that might run Racket
code, and this function is called by the scheduler when
false_pos_ok is true. So, in that case, we assume that if the
port's evt is ready, then the port is ready. (After
@ -1589,7 +1589,7 @@ int scheme_byte_ready_or_user_port_ready(Scheme_Object *p, Scheme_Schedule_Info
return 1;
if (SAME_OBJ(scheme_user_input_port_type, ip->sub_type)) {
/* We can't call the normal byte_ready because that runs Scheme
/* We can't call the normal byte_ready because that runs Racket
code, and this function is called by the scheduler when
false_pos_ok is true. So, in that case, we assume that if the
port's evt is ready, then the port is ready. (After

6
src/racket/src/portfun.c
View File

@ -725,7 +725,7 @@ scheme_get_string_output(Scheme_Object *port)
}
/*========================================================================*/
/* "user" input ports (created from Scheme) */
/* "user" input ports (created from Racket) */
/*========================================================================*/
typedef struct User_Input_Port {
@ -1223,7 +1223,7 @@ user_input_buffer_mode(Scheme_Port *p, int mode)
}
/*========================================================================*/
/* "user" output ports (created from Scheme) */
/* "user" output ports (created from Racket) */
/*========================================================================*/
typedef struct User_Output_Port {
@ -2143,7 +2143,7 @@ static int pipe_output_p(Scheme_Object *o)
}
/*========================================================================*/
/* Scheme functions and helpers */
/* Racket functions and helpers */
/*========================================================================*/
static Scheme_Object *

2
src/racket/src/read.c
View File

@ -147,7 +147,7 @@ typedef struct Readtable {
Scheme_Object so;
Scheme_Hash_Table *mapping; /* pos int -> (cons int proc-or-char); neg int -> proc */
char *fast_mapping;
Scheme_Object *symbol_parser; /* NULL or a Scheme function */
Scheme_Object *symbol_parser; /* NULL or a Racket function */
char **names; /* error-message names */
} Readtable;

2
src/racket/src/regexp.c
View File

@ -5015,7 +5015,7 @@ static int translate(unsigned char *s, int len, char **result, int pcre)
}
/************************************************************/
/* Scheme front end */
/* Racket front end */
/************************************************************/
int scheme_is_pregexp(Scheme_Object *o)

2
src/racket/src/salloc.c
View File

@ -1393,7 +1393,7 @@ static void do_next_finalization(void *o, void *_data)
if (fns->scheme_first) {
if (fns->scheme_first->next || fns->ext_f || fns->prim_first) {
/* Re-install low-level finalizer and run a scheme finalizer */
/* Re-install low-level finalizer and run a Racket finalizer */
GC_register_eager_finalizer(o, fns->scheme_first->next ? 1 : 2,
do_next_finalization, _data, NULL, NULL);
}

2
src/racket/src/schmap.inc
View File

@ -3,7 +3,7 @@
/*
DO_MAP = C function name
MAP_NAME = Scheme function name as string
MAP_NAME = Racket function name as string
MAP_MODE => map
FOR_EACH_MODE => for-each
AND_MODE => and mode

4
src/racket/src/schpriv.h
View File

@ -593,7 +593,7 @@ typedef struct Scheme_Security_Guard {
/* Always allocated on the stack: */
typedef struct {
Scheme_Thread *false_positive_ok; /* non-zero => return 1 to swap in thread rather than running Scheme code */
Scheme_Thread *false_positive_ok; /* non-zero => return 1 to swap in thread rather than running Racket code */
int potentially_false_positive; /* => returning 1 to swap thread in, but truth may be 0 */
Scheme_Object *current_syncing;
double sleep_end;
@ -653,7 +653,7 @@ Scheme_Custodian* scheme_custodian_extract_reference(Scheme_Custodian_Reference
#define GLOB_HAS_REF_ID 16
/* can cast to Scheme_Bucket_With_Home: */
#define GLOB_HAS_HOME_PTR 32
/* Scheme-level constant (cannot be changed further): */
/* Racket-level constant (cannot be changed further): */
#define GLOB_IS_IMMUTATED 64
/* Linked from other (cannot be undefined): */
#define GLOB_IS_LINKED 128

2
src/racket/src/string.c
View File

@ -112,7 +112,7 @@ static void init_iconv()
if (iconv) {
iconv_errno = (errno_proc_t)GetProcAddress(m, "_errno");
if (!iconv_errno) {
/* The iconv.dll distributed with PLT Scheme links to msvcrt.dll.
/* The iconv.dll distributed with Racket links to msvcrt.dll.
It's a slighly dangerous assumption that whatever iconv we
found also uses msvcrt.dll. */
m = LoadLibrary("msvcrt.dll");

2
src/racket/src/syntax.c
View File

@ -7606,7 +7606,7 @@ void scheme_simplify_stx(Scheme_Object *stx, Scheme_Object *cache)
}
/*========================================================================*/
/* Scheme functions and helpers */
/* Racket functions and helpers */
/*========================================================================*/
static Scheme_Object *syntax_p(int argc, Scheme_Object **argv)

6
src/racket/src/thread.c
View File

@ -100,7 +100,7 @@ THREAD_LOCAL_DECL(extern void *scheme_break_semaphore;)
# define SENORA_GC_NO_FREE
#endif
/* If a finalization callback invokes Scheme code,
/* If a finalization callback invokes Racket code,
we can end up with a thread swap in the middle of a thread
swap (where the outer swap was interrupted by GC). The
following is a debugging flag to help detect and fix
@ -592,7 +592,7 @@ void scheme_init_memtrace(Scheme_Env *env)
void scheme_init_inspector() {
REGISTER_SO(initial_inspector);
initial_inspector = scheme_make_initial_inspectors();
/* Keep the initial inspector in case someone resets Scheme (by
/* Keep the initial inspector in case someone resets Racket (by
calling scheme_basic_env() a second time. Using the same
inspector after a reset lets us use the same initial module
instances. */
@ -6402,7 +6402,7 @@ static Scheme_Object *extend_parameterization(int argc, Scheme_Object *argv[])
static Scheme_Object *reparameterize(int argc, Scheme_Object **argv)
{
/* Clones values of all built-in parameters in a new parameterization.
This could be implemented in Scheme by enumerating all built-in parameters,
This could be implemented in Racket by enumerating all built-in parameters,
but it's easier and faster here. We need this for the Planet resolver. */
Scheme_Config *c, *naya;
Scheme_Parameterization *pz, *npz;

2
src/worksp/gracket/gracket.manifest
View File

@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.2.0.1"
processorArchitecture="X86"
name="Org.PLT-Scheme.GRacket"
name="Org.Racket-Lang.GRacket"
type="win32" />
<description>GRacket: Graphical Racket.</description>
<!-- Avoid UAC -->

2
src/worksp/racket/racket.manifest
View File

@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.2.0.1"
processorArchitecture="X86"
name="Org.PLT-Scheme.Racket"
name="Org.Racket-Lang.Racket"
type="win32" />
<description>Racket.</description>
<!-- Avoid UAC -->