summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL.MPW10
-rw-r--r--Makefile.Mac.depend18
-rw-r--r--byterun/Makefile.Mac10
-rw-r--r--byterun/Makefile.Mac.depend1112
-rw-r--r--config/sm-Mac.h2
-rw-r--r--maccaml/Makefile.Mac7
-rw-r--r--maccaml/Makefile.Mac.depend170
-rw-r--r--maccaml/aboutbox.c1
-rw-r--r--maccaml/appleevents.c8
-rw-r--r--maccaml/events.c1
-rw-r--r--maccaml/graph.c132
-rw-r--r--maccaml/graphprims2
-rw-r--r--maccaml/main.h1
-rw-r--r--maccaml/menus.c4
-rw-r--r--maccaml/numprims1
-rw-r--r--maccaml/windows.c2
-rw-r--r--otherlibs/graph/graphics.mli22
-rw-r--r--otherlibs/num/Makefile.Mac11
-rw-r--r--otherlibs/num/Makefile.Mac.depend8
-rw-r--r--otherlibs/num/bignum/Makefile.Mac2
-rw-r--r--otherlibs/str/Makefile.Mac3
-rw-r--r--otherlibs/str/Makefile.Mac.depend6
-rw-r--r--otherlibs/str/regex-0.12/Makefile.Mac4
-rw-r--r--stdlib/Makefile.Mac.depend6
-rw-r--r--yacc/Makefile.Mac4
25 files changed, 161 insertions, 1386 deletions
diff --git a/INSTALL.MPW b/INSTALL.MPW
index 6deb88b67..ce67a2753 100644
--- a/INSTALL.MPW
+++ b/INSTALL.MPW
@@ -12,7 +12,7 @@
# PREREQUISITES
-# You need MPW 3.4.4 (with MrC) and Universal Interfaces version 3.2
+# You need MPW 3.5 (with MrC) and Universal Interfaces version 3.3
# You need ToolServer (which comes with MPW by default).
# You need WASTE version 1.3
#
@@ -39,9 +39,13 @@ Directory "`echo "{active}" | streamedit -e '1 replace /[Â:]*°/ ""'`"
# Copy some useful scripts to your Commands directory.
# DoMake is absolutely needed for installation
# Characters is only needed by the executable error messages
-# MakeDepend is only needed if you rebuild the dependency makefiles
-Duplicate :tools:DoMake :tools:Characters :tools:MakeDepend "{MPW}User Commands:"
+Duplicate :tools:DoMake :tools:Characters "{MPW}User Commands:"
+
+# NOTE: if you have MakeDepend from a previous version of O'Caml, you
+# must remove it from "{MPW}User Commands:". It is not needed any more
+# since MPW 3.5 has a MakeDepend command.
+
# Build the WASTE libraries:
diff --git a/Makefile.Mac.depend b/Makefile.Mac.depend
index 694f97dea..ffe2ddb34 100644
--- a/Makefile.Mac.depend
+++ b/Makefile.Mac.depend
@@ -10,8 +10,6 @@
:utils:formatmsg.cmxÄ :utils:formatmsg.cmi
:utils:misc.cmoÄ :utils:misc.cmi
:utils:misc.cmxÄ :utils:misc.cmi
-:utils:nativeint.cmoÄ :utils:nativeint.cmi
-:utils:nativeint.cmxÄ :utils:nativeint.cmi
:utils:tbl.cmoÄ :utils:formatmsg.cmi :utils:tbl.cmi
:utils:tbl.cmxÄ :utils:formatmsg.cmx :utils:tbl.cmi
:utils:terminfo.cmoÄ :utils:terminfo.cmi
@@ -285,8 +283,8 @@
:typing:primitive.cmi :typing:typedtree.cmi :typing:types.cmi
:bytecomp:translmod.cmiÄ :bytecomp:lambda.cmi :typing:typedtree.cmi
:bytecomp:translobj.cmiÄ :typing:ident.cmi :bytecomp:lambda.cmi
-:bytecomp:typeopt.cmiÄ :bytecomp:lambda.cmi :typing:typedtree.cmi ¶
- :typing:types.cmi
+:bytecomp:typeopt.cmiÄ :bytecomp:lambda.cmi :typing:path.cmi ¶
+ :typing:typedtree.cmi
:bytecomp:bytegen.cmoÄ :parsing:asttypes.cmi :typing:ident.cmi ¶
:bytecomp:instruct.cmi :bytecomp:lambda.cmi :utils:misc.cmi ¶
:typing:primitive.cmi :typing:types.cmi :bytecomp:bytegen.cmi
@@ -408,13 +406,13 @@
:typing:ident.cmx :bytecomp:lambda.cmx :parsing:longident.cmx ¶
:utils:misc.cmx :bytecomp:translobj.cmi
:bytecomp:typeopt.cmoÄ :parsing:asttypes.cmi :typing:ctype.cmi ¶
- :typing:env.cmi :bytecomp:lambda.cmi :utils:misc.cmi :typing:path.cmi ¶
- :typing:predef.cmi :typing:primitive.cmi :typing:typedtree.cmi ¶
- :typing:types.cmi :bytecomp:typeopt.cmi
+ :typing:env.cmi :typing:ident.cmi :bytecomp:lambda.cmi :utils:misc.cmi ¶
+ :typing:path.cmi :typing:predef.cmi :typing:primitive.cmi ¶
+ :typing:typedtree.cmi :typing:types.cmi :bytecomp:typeopt.cmi
:bytecomp:typeopt.cmxÄ :parsing:asttypes.cmi :typing:ctype.cmx ¶
- :typing:env.cmx :bytecomp:lambda.cmx :utils:misc.cmx :typing:path.cmx ¶
- :typing:predef.cmx :typing:primitive.cmx :typing:typedtree.cmx ¶
- :typing:types.cmx :bytecomp:typeopt.cmi
+ :typing:env.cmx :typing:ident.cmx :bytecomp:lambda.cmx :utils:misc.cmx ¶
+ :typing:path.cmx :typing:predef.cmx :typing:primitive.cmx ¶
+ :typing:typedtree.cmx :typing:types.cmx :bytecomp:typeopt.cmi
:driver:compile.cmiÄ :typing:env.cmi
:driver:optcompile.cmiÄ :typing:env.cmi
:driver:compile.cmoÄ :bytecomp:bytegen.cmi :utils:ccomp.cmi ¶
diff --git a/byterun/Makefile.Mac b/byterun/Makefile.Mac
index 0a1a9c52e..d7754ca8b 100644
--- a/byterun/Makefile.Mac
+++ b/byterun/Makefile.Mac
@@ -13,7 +13,7 @@
# $Id$
C = sc
-COptions = -model far # -d DEBUG -mbg full
+COptions = -model far -w 29,30,35 # -d DEBUG -mbg full
AOptions = -model far # -d DEBUG -wb -l
LinkOptions = -model far -ad 4 -msg nodup -compact -pad 0 -state nouse -br 68k
Libs = "{libraries}IntEnv.o" ¶
@@ -24,7 +24,7 @@ Libs = "{libraries}IntEnv.o" ¶
"{libraries}ToolLibs.o"
PPCC = mrc
-PPCCOptions = -w 35 # -sym on -d DEBUG # beware: "-sym on" => "-opt off"
+PPCCOptions = -w 29,30,35 # -sym on -d DEBUG # beware: "-sym on" => "-opt off"
PPCLinkOptions = -d # -sym on
PPCLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o" ¶
"{ppclibraries}PPCToolLibs.o" "{sharedlibraries}StdCLib" ¶
@@ -125,8 +125,6 @@ opnames.h Ä instruct.h
rotatecursor.c.o Ä
{C} -b rotatecursor.c -o rotatecursor.c.o {COptions}
-md5.c.x Ä
- {PPCC} -opt off md5.c -o md5.c.x {PPCCOptions}
-
depend Ä prims.c opnames.h
- makedepend Å.c > Makefile.Mac.depend
+ makedepend Å.c > Makefile.Mac.depend · dev:null
+ makedepend -objext .x Å.c >> Makefile.Mac.depend · dev:null
diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend
index 5f6094d1e..e69de29bb 100644
--- a/byterun/Makefile.Mac.depend
+++ b/byterun/Makefile.Mac.depend
@@ -1,1112 +0,0 @@
-
-"alloc.c.x" Ä alloc.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- stacks.h
-
-"array.c.x" Ä array.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"callback.c.x" Ä callback.c ¶
- callback.h ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- interp.h ¶
- instruct.h ¶
- fix_code.h ¶
- stacks.h
-
-"compact.c.x" Ä compact.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- finalise.h ¶
- roots.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- mlvalues.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- weak.h
-
-"compare.c.x" Ä compare.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"debugger.c.x" Ä debugger.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- debugger.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- fix_code.h ¶
- instruct.h ¶
- intext.h ¶
- io.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- sys.h
-
-"extern.c.x" Ä extern.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- intext.h ¶
- io.h ¶
- fix_code.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h
-
-"fail.c.x" Ä fail.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h ¶
- gc.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h ¶
- stacks.h
-
-"finalise.c.x" Ä finalise.c ¶
- callback.h ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h
-
-"fix_code.c.x" Ä fix_code.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- debugger.h ¶
- misc.h ¶
- mlvalues.h ¶
- fix_code.h ¶
- instruct.h ¶
- md5.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h
-
-"floats.c.x" Ä floats.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- stacks.h
-
-"freelist.c.x" Ä freelist.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- freelist.h ¶
- misc.h ¶
- mlvalues.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h
-
-"gc_ctrl.c.x" Ä gc_ctrl.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- compact.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- stacks.h ¶
- memory.h
-
-"hash.c.x" Ä hash.c ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"instrtrace.c.x" Ä instrtrace.c ¶
- instruct.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- opnames.h
-
-"intern.c.x" Ä intern.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- intext.h ¶
- io.h ¶
- fix_code.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h ¶
- md5.h
-
-"interp.c.x" Ä interp.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- callback.h ¶
- debugger.h ¶
- fail.h ¶
- fix_code.h ¶
- instrtrace.h ¶
- instruct.h ¶
- interp.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- prims.h ¶
- signals.h ¶
- stacks.h
-
-"ints.c.x" Ä ints.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"io.c.x" Ä io.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h ¶
- sys.h ¶
- ui.h
-
-"lexing.c.x" Ä lexing.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"macintosh.c.x" Ä macintosh.c ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- rotatecursor.h
-
-"main.c.x" Ä main.c ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- sys.h ¶
- rotatecursor.h ¶
- signals.h
-
-"major_gc.c.x" Ä major_gc.c ¶
- compact.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- mlvalues.h ¶
- finalise.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- weak.h
-
-"md5.c.x" Ä md5.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- md5.h ¶
- io.h ¶
- reverse.h
-
-"memory.c.x" Ä memory.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- freelist.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h ¶
- memory.h ¶
- minor_gc.h ¶
- signals.h
-
-"meta.c.x" Ä meta.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- fix_code.h ¶
- interp.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- prims.h ¶
- stacks.h
-
-"minor_gc.c.x" Ä minor_gc.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- fail.h ¶
- misc.h ¶
- mlvalues.h ¶
- finalise.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- signals.h
-
-"misc.c.x" Ä misc.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- ui.h
-
-"obj.c.x" Ä obj.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- minor_gc.h ¶
- prims.h
-
-"parsing.c.x" Ä parsing.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- alloc.h
-
-"prims.c.x" Ä prims.c ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- prims.h
-
-"printexc.c.x" Ä printexc.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- ui.h
-
-"roots.c.x" Ä roots.c ¶
- major_gc.h ¶
- freelist.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- roots.h ¶
- stacks.h
-
-"rotatecursor.c.x" Ä rotatecursor.c ¶
- rotatecursor.h
-
-"signals.c.x" Ä signals.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- callback.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- roots.h ¶
- signals.h ¶
- sys.h ¶
- rotatecursor.h
-
-"stacks.c.x" Ä stacks.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- fail.h ¶
- misc.h ¶
- mlvalues.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"startup.c.x" Ä startup.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- callback.h ¶
- debugger.h ¶
- exec.h ¶
- fail.h ¶
- fix_code.h ¶
- gc_ctrl.h ¶
- interp.h ¶
- intext.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- prims.h ¶
- stacks.h ¶
- sys.h
-
-"str.c.x" Ä str.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h
-
-"sys.c.x" Ä sys.c ¶
- macintosh.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- debugger.h ¶
- fail.h ¶
- instruct.h ¶
- signals.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- sys.h ¶
- ui.h
-
-"terminfo.c.x" Ä terminfo.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h
-
-"weak.c.x" Ä weak.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"wincmdline.c.x" Ä wincmdline.c
-
-
-"alloc.c.o" Ä alloc.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- stacks.h
-
-"array.c.o" Ä array.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"callback.c.o" Ä callback.c ¶
- callback.h ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- interp.h ¶
- instruct.h ¶
- fix_code.h ¶
- stacks.h
-
-"compact.c.o" Ä compact.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- finalise.h ¶
- roots.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- mlvalues.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- weak.h
-
-"compare.c.o" Ä compare.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"debugger.c.o" Ä debugger.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- debugger.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- fix_code.h ¶
- instruct.h ¶
- intext.h ¶
- io.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- sys.h
-
-"extern.c.o" Ä extern.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- intext.h ¶
- io.h ¶
- fix_code.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h
-
-"fail.c.o" Ä fail.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h ¶
- gc.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h ¶
- stacks.h
-
-"finalise.c.o" Ä finalise.c ¶
- callback.h ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h
-
-"fix_code.c.o" Ä fix_code.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- debugger.h ¶
- misc.h ¶
- mlvalues.h ¶
- fix_code.h ¶
- instruct.h ¶
- md5.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h
-
-"floats.c.o" Ä floats.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- stacks.h
-
-"freelist.c.o" Ä freelist.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- freelist.h ¶
- misc.h ¶
- mlvalues.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h
-
-"gc_ctrl.c.o" Ä gc_ctrl.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- compact.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- stacks.h ¶
- memory.h
-
-"hash.c.o" Ä hash.c ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"instrtrace.c.o" Ä instrtrace.c ¶
- instruct.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- opnames.h
-
-"intern.c.o" Ä intern.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- intext.h ¶
- io.h ¶
- fix_code.h ¶
- memory.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- reverse.h ¶
- md5.h
-
-"interp.c.o" Ä interp.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- callback.h ¶
- debugger.h ¶
- fail.h ¶
- fix_code.h ¶
- instrtrace.h ¶
- instruct.h ¶
- interp.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- prims.h ¶
- signals.h ¶
- stacks.h
-
-"ints.c.o" Ä ints.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"io.c.o" Ä io.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- signals.h ¶
- sys.h ¶
- ui.h
-
-"lexing.c.o" Ä lexing.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"macintosh.c.o" Ä macintosh.c ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- rotatecursor.h
-
-"main.c.o" Ä main.c ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- sys.h ¶
- rotatecursor.h ¶
- signals.h
-
-"major_gc.c.o" Ä major_gc.c ¶
- compact.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- fail.h ¶
- mlvalues.h ¶
- finalise.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- weak.h
-
-"md5.c.o" Ä md5.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- md5.h ¶
- io.h ¶
- reverse.h
-
-"memory.c.o" Ä memory.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- freelist.h ¶
- gc.h ¶
- gc_ctrl.h ¶
- major_gc.h ¶
- memory.h ¶
- minor_gc.h ¶
- signals.h
-
-"meta.c.o" Ä meta.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- fix_code.h ¶
- interp.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- prims.h ¶
- stacks.h
-
-"minor_gc.c.o" Ä minor_gc.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- fail.h ¶
- misc.h ¶
- mlvalues.h ¶
- finalise.h ¶
- roots.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- gc_ctrl.h ¶
- signals.h
-
-"misc.c.o" Ä misc.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- ui.h
-
-"obj.c.o" Ä obj.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- memory.h ¶
- minor_gc.h ¶
- prims.h
-
-"parsing.c.o" Ä parsing.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- misc.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- alloc.h
-
-"prims.c.o" Ä prims.c ¶
- mlvalues.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- misc.h ¶
- prims.h
-
-"printexc.c.o" Ä printexc.c ¶
- fail.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- ui.h
-
-"roots.c.o" Ä roots.c ¶
- major_gc.h ¶
- freelist.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- memory.h ¶
- gc.h ¶
- minor_gc.h ¶
- roots.h ¶
- stacks.h
-
-"rotatecursor.c.o" Ä rotatecursor.c ¶
- rotatecursor.h
-
-"signals.c.o" Ä signals.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- callback.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- roots.h ¶
- signals.h ¶
- sys.h ¶
- rotatecursor.h
-
-"stacks.c.o" Ä stacks.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- fail.h ¶
- misc.h ¶
- mlvalues.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"startup.c.o" Ä startup.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- callback.h ¶
- debugger.h ¶
- exec.h ¶
- fail.h ¶
- fix_code.h ¶
- gc_ctrl.h ¶
- interp.h ¶
- intext.h ¶
- io.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- prims.h ¶
- stacks.h ¶
- sys.h
-
-"str.c.o" Ä str.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h
-
-"sys.c.o" Ä sys.c ¶
- macintosh.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- debugger.h ¶
- fail.h ¶
- instruct.h ¶
- signals.h ¶
- stacks.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h ¶
- sys.h ¶
- ui.h
-
-"terminfo.c.o" Ä terminfo.c ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- alloc.h ¶
- misc.h ¶
- mlvalues.h ¶
- fail.h ¶
- io.h
-
-"weak.c.o" Ä weak.c ¶
- alloc.h ¶
- misc.h ¶
- config.h ¶
- ::config:sm-Mac.h ¶
- mlvalues.h ¶
- fail.h ¶
- memory.h ¶
- gc.h ¶
- major_gc.h ¶
- freelist.h ¶
- minor_gc.h
-
-"wincmdline.c.o" Ä wincmdline.c
-
diff --git a/config/sm-Mac.h b/config/sm-Mac.h
index e9e6bb98c..16cf46b5c 100644
--- a/config/sm-Mac.h
+++ b/config/sm-Mac.h
@@ -35,3 +35,5 @@
#define CPU_TYPE_STRING "68k"
#define THREADED_CODE
#endif
+
+/* FIXME to do: add 64-bit integer stuff */
diff --git a/maccaml/Makefile.Mac b/maccaml/Makefile.Mac
index 92e3a1548..ee2c8742b 100644
--- a/maccaml/Makefile.Mac
+++ b/maccaml/Makefile.Mac
@@ -19,7 +19,7 @@ XIncludes = -i ::byterun: ¶
-i ":WASTE:WASTE 1.3 Distribution:WASTE C/C++ Headers:"
C = sc
-COptions = {XIncludes} -model far -w 17 #-d DEBUG=1
+COptions = {XIncludes} -model far #-d DEBUG=1
LinkOptions = -model far -compact -pad 0 -state nouse -br 68k -msg nodup
SysLibs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
"{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
@@ -29,7 +29,7 @@ WELibs = ":WASTE:WASTE 1.3 Distribution:WASTELib.o"
Libs = {camlrunlibs} {welibs} {syslibs}
PPCC = mrc
-PPCCOptions = {XIncludes} -proto strict -sym on -w 35 #-d DEBUG=1
+PPCCOptions = {XIncludes} -proto strict -sym on #-d DEBUG=1
PPCLinkOptions = -d -sym on
PPCSysLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o" ¶
"{sharedlibraries}StdCLib" ¶
@@ -112,4 +112,5 @@ clean Ä
delete -i "Objective Caml.xcoff" "Objective Caml.dbg"
depend Ä prims.c
- makedepend Å.c > Makefile.Mac.depend
+ makedepend Å.c > Makefile.Mac.depend · dev:null
+ makedepend -objext .x Å.c >> Makefile.Mac.depend · dev:null
diff --git a/maccaml/Makefile.Mac.depend b/maccaml/Makefile.Mac.depend
index d76d0fb6e..e69de29bb 100644
--- a/maccaml/Makefile.Mac.depend
+++ b/maccaml/Makefile.Mac.depend
@@ -1,170 +0,0 @@
-
-"aboutbox.c.x" Ä aboutbox.c ¶
- main.h ¶
- constants.h
-
-"appleevents.c.x" Ä appleevents.c ¶
- main.h ¶
- constants.h
-
-"clipboard.c.x" Ä clipboard.c ¶
- main.h ¶
- constants.h
-
-"drag.c.x" Ä drag.c ¶
- main.h ¶
- constants.h
-
-"dummy_fragment.c.x" Ä dummy_fragment.c
-
-"errors.c.x" Ä errors.c ¶
- main.h ¶
- constants.h
-
-"events.c.x" Ä events.c ¶
- main.h ¶
- constants.h
-
-"files.c.x" Ä files.c ¶
- main.h ¶
- constants.h
-
-"glue.c.x" Ä glue.c ¶
- main.h ¶
- constants.h
-
-"graph.c.x" Ä graph.c ¶
- main.h ¶
- constants.h
-
-"lcontrols.c.x" Ä lcontrols.c ¶
- main.h ¶
- constants.h
-
-"lib.c.x" Ä lib.c ¶
- main.h ¶
- constants.h
-
-"main.c.x" Ä main.c ¶
- main.h ¶
- constants.h
-
-"memory.c.x" Ä memory.c ¶
- main.h ¶
- constants.h
-
-"menus.c.x" Ä menus.c ¶
- main.h ¶
- constants.h
-
-"misc.c.x" Ä misc.c ¶
- main.h ¶
- constants.h
-
-"modalfilter.c.x" Ä modalfilter.c ¶
- main.h ¶
- constants.h
-
-"prefs.c.x" Ä prefs.c ¶
- main.h ¶
- constants.h
-
-"prims.c.x" Ä prims.c
-
-"print.c.x" Ä print.c ¶
- main.h ¶
- constants.h
-
-"scroll.c.x" Ä scroll.c ¶
- main.h ¶
- constants.h
-
-"windows.c.x" Ä windows.c ¶
- main.h ¶
- constants.h
-
-
-"aboutbox.c.o" Ä aboutbox.c ¶
- main.h ¶
- constants.h
-
-"appleevents.c.o" Ä appleevents.c ¶
- main.h ¶
- constants.h
-
-"clipboard.c.o" Ä clipboard.c ¶
- main.h ¶
- constants.h
-
-"drag.c.o" Ä drag.c ¶
- main.h ¶
- constants.h
-
-"dummy_fragment.c.o" Ä dummy_fragment.c
-
-"errors.c.o" Ä errors.c ¶
- main.h ¶
- constants.h
-
-"events.c.o" Ä events.c ¶
- main.h ¶
- constants.h
-
-"files.c.o" Ä files.c ¶
- main.h ¶
- constants.h
-
-"glue.c.o" Ä glue.c ¶
- main.h ¶
- constants.h
-
-"graph.c.o" Ä graph.c ¶
- main.h ¶
- constants.h
-
-"lcontrols.c.o" Ä lcontrols.c ¶
- main.h ¶
- constants.h
-
-"lib.c.o" Ä lib.c ¶
- main.h ¶
- constants.h
-
-"main.c.o" Ä main.c ¶
- main.h ¶
- constants.h
-
-"memory.c.o" Ä memory.c ¶
- main.h ¶
- constants.h
-
-"menus.c.o" Ä menus.c ¶
- main.h ¶
- constants.h
-
-"misc.c.o" Ä misc.c ¶
- main.h ¶
- constants.h
-
-"modalfilter.c.o" Ä modalfilter.c ¶
- main.h ¶
- constants.h
-
-"prefs.c.o" Ä prefs.c ¶
- main.h ¶
- constants.h
-
-"prims.c.o" Ä prims.c
-
-"print.c.o" Ä print.c ¶
- main.h ¶
- constants.h
-
-"scroll.c.o" Ä scroll.c ¶
- main.h ¶
- constants.h
-
-"windows.c.o" Ä windows.c ¶
- main.h ¶
- constants.h
-
diff --git a/maccaml/aboutbox.c b/maccaml/aboutbox.c
index cff13d622..048a5495d 100644
--- a/maccaml/aboutbox.c
+++ b/maccaml/aboutbox.c
@@ -21,6 +21,7 @@ static UserItemUPP DrawAboutUPP = NULL;
static pascal void DrawAbout (DialogPtr d, short item)
{
+#pragma unused (item)
WEHandle we = WinGetWE (d);
Assert (we != NULL);
diff --git a/maccaml/appleevents.c b/maccaml/appleevents.c
index 123f086dd..220027ce6 100644
--- a/maccaml/appleevents.c
+++ b/maccaml/appleevents.c
@@ -30,7 +30,7 @@ static OSErr GotRequiredParams (const AppleEvent *ae)
static pascal OSErr HandleOpenApplication (const AppleEvent *ae,
AppleEvent *reply, long refCon)
{
-#pragma unused (refCon)
+#pragma unused (ae, reply, refCon)
launch_toplevel_requested = 1;
return noErr;
}
@@ -38,7 +38,7 @@ static pascal OSErr HandleOpenApplication (const AppleEvent *ae,
static pascal OSErr HandleQuitApplication (const AppleEvent *ae,
AppleEvent *reply, long refCon)
{
-#pragma unused (refCon)
+#pragma unused (ae, reply, refCon)
WindowPtr w = FrontWindow ();
WStatusH st;
int request_interaction = prefs.asksavetop && winToplevel != NULL;
@@ -65,7 +65,7 @@ static pascal OSErr HandleQuitApplication (const AppleEvent *ae,
static pascal OSErr HandleOpenDocuments (const AppleEvent *ae,
AppleEvent *reply, long refCon)
{
-#pragma unused (refCon)
+#pragma unused (reply, refCon)
FSSpec filespec;
AEDescList doclist = {0, NULL};
OSErr err;
@@ -111,7 +111,7 @@ static pascal OSErr HandleOpenDocuments (const AppleEvent *ae,
static pascal OSErr HandlePrintDocuments (const AppleEvent *ae,
AppleEvent *reply, long refCon)
{
-#pragma unused (refCon)
+#pragma unused (ae, reply, refCon)
return errAEEventNotHandled; /* XXX */
}
diff --git a/maccaml/events.c b/maccaml/events.c
index 47230f294..796270916 100644
--- a/maccaml/events.c
+++ b/maccaml/events.c
@@ -166,6 +166,7 @@ static void DoMouseUp (EventRecord *e)
static void DoNullEvent (EventRecord *event)
{
+#pragma unused (event)
WindowPtr w = FrontWindow ();
if (w != NULL) WinDoIdle (w);
diff --git a/maccaml/graph.c b/maccaml/graph.c
index 5dc41fa7d..246df5316 100644
--- a/maccaml/graph.c
+++ b/maccaml/graph.c
@@ -60,7 +60,7 @@ static void GraphUpdateGW (void)
{
Rect r;
WStatusH st = WinGetStatus (winGraphics);
-
+
Assert (st != NULL);
Assert (gworld != NULL);
WELongRectToRect (&(*st)->destrect, &r);
@@ -115,7 +115,7 @@ void GraphScroll (long dx, long dy)
GraphUpdate ();
ClipRect (&maxrect);
DisposeRgn (update);
-
+
x0 += dx;
y0 += dy;
GetPen (&p);
@@ -184,10 +184,10 @@ void GraphGotEvent (EventRecord *evt)
GrafPtr saveport;
Point pt = evt->where;
GraphEvent grevt;
-
+
PushWindowPort (winGraphics);
GlobalToLocal (&pt);
- PopPort;
+ PopPort;
switch (evt->what){
case mouseDown:
@@ -222,6 +222,8 @@ value gr_open_graph (value vgeometry);
value gr_close_graph (value unit);
value gr_sigio_signal (value unit);
value gr_sigio_handler (value unit);
+value gr_auto_flush (value flag);
+value gr_flush (value unit);
value gr_clear_graph (value unit);
value gr_size_x (value unit);
value gr_size_y (value unit);
@@ -254,6 +256,15 @@ value gr_sound (value vfreq, value vdur);
/**** Ancillary macros and function */
+/* double-buffer or write-through */
+static int grautoflush;
+
+/* Current state */
+static long cur_x, cur_y;
+static short cur_width, cur_font, cur_size;
+/* see also fgcolor */
+
+
/* Drawing off-screen and on-screen simultaneously. The following three
macros must always be used together and in this order.
*/
@@ -270,14 +281,16 @@ value gr_sound (value vfreq, value vdur);
#define On \
SetGWorld (_saveport_, _savegdev_); \
UnlockPixels (GetGWorldPixMap (gworld)); \
- SetPort (winGraphics); \
- ScrollCalcGraph (winGraphics, &_cliprect_); \
- ClipRect (&_cliprect_);
+ if (grautoflush){ \
+ SetPort (winGraphics); \
+ ScrollCalcGraph (winGraphics, &_cliprect_); \
+ ClipRect (&_cliprect_);
/* 3. Clean up after drawing. */
#define End \
- ClipRect (&maxrect); \
- SetPort ((GrafPtr) _saveport_); \
+ ClipRect (&maxrect); \
+ SetPort ((GrafPtr) _saveport_); \
+ } \
}
/* Convert a red, green, or blue value from 8 bits to 16 bits. */
@@ -358,7 +371,7 @@ static value gr_alloc_int_vect(mlsize_t size)
{
value res;
mlsize_t i;
-
+
if (size <= Max_young_wosize) {
res = alloc(size, 0);
} else {
@@ -396,7 +409,7 @@ value gr_open_graph (value vgeometry)
err = WinOpenGraphics (w0, h0);
if (err != noErr) goto failed;
-
+
x0 = y0 = 0;
st = WinGetStatus (winGraphics); Assert (st != NULL);
@@ -408,13 +421,14 @@ value gr_open_graph (value vgeometry)
fgcolor.red = fgcolor.green = fgcolor.blue = 0;
}
/* Synchronise off-screen and on-screen by initialising everything. */
+ grautoflush = 1;
gr_clear_graph (Val_unit);
gr_moveto (Val_long (0), Val_long (0));
gr_set_color (Val_long (0));
gr_set_line_width (Val_long (0));
gr_set_font ((value) "geneva"); /* XXX hack */
gr_set_text_size (Val_long (12));
-
+
return Val_unit;
failed:
@@ -439,11 +453,38 @@ value gr_close_graph (value unit)
value gr_sigio_signal (value unit) /* Not used on MacOS */
{
+#pragma unused (unit)
return Val_unit;
}
value gr_sigio_handler (value unit) /* Not used on MacOS */
{
+#pragma unused (unit)
+ return Val_unit;
+}
+
+value gr_flush (value unit)
+{
+#pragma unused (unit)
+ GraphUpdate ();
+ return Val_unit;
+}
+
+value gr_auto_flush (value flag)
+{
+ int newval = Bool_val (flag);
+
+ if (newval && !grautoflush){
+ gr_flush (Val_unit);
+ BeginOff
+ On
+ MoveTo (Wx (cur_x), Wy (cur_y));
+ PenSize (cur_width, cur_width);
+ TextFont (cur_font);
+ TextSize (cur_size);
+ End
+ }
+ grautoflush = newval;
return Val_unit;
}
@@ -476,7 +517,7 @@ value gr_size_y (value unit)
value gr_set_color (value vrgb)
{
long rgb = Long_val (vrgb);
-
+
gr_check_open ();
fgcolor.red = RGB8to16 ((rgb >> 16) & 0xFF);
fgcolor.green = RGB8to16 ((rgb >> 8) & 0xFF);
@@ -529,6 +570,7 @@ value gr_moveto (value vx, value vy)
On
MoveTo (Wx (x), Wy (y));
End
+ cur_x = x; cur_y = y;
return Val_unit;
}
@@ -536,34 +578,30 @@ value gr_current_point (value unit)
{
#pragma unused (unit)
value result = alloc_tuple (2);
- Point p;
-
+
gr_check_open ();
- BeginOff
- GetPen (&p);
- On
- End
- Field (result, 0) = Val_long (Bx (p.h));
- Field (result, 1) = Val_long (By (p.v));
+ Field (result, 0) = Val_long (cur_x);
+ Field (result, 1) = Val_long (cur_y);
return result;
}
value gr_lineto (value vx, value vy)
{
XY;
-
+
gr_check_open ();
BeginOff
LineTo (Bx (x), By (y));
On
LineTo (Wx (x), Wy (y));
End
-
+ cur_x = x; cur_y = y;
return Val_unit;
}
value gr_draw_arc (value *argv, int argc)
{
+#pragma unused (argc)
return gr_draw_arc_nat (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
}
@@ -575,7 +613,7 @@ value gr_draw_arc_nat (value vx, value vy, value vrx, value vry, value va1,
long a1 = Long_val (va1), a2 = Long_val (va2);
Rect r;
long qda1 = 90 - a1, qda2 = 90 - a2;
-
+
gr_check_open ();
BeginOff
SetRect (&r, Bx (x-rx), By (y+ry), Bx (x+rx), By (y-ry));
@@ -591,13 +629,14 @@ value gr_set_line_width (value vwidth)
{
short width = Int_val (vwidth);
- if (width == 0) width = 1;
+ if (width == 0) width = 1;
gr_check_open ();
BeginOff
PenSize (width, width);
On
PenSize (width, width);
End
+ cur_width = width;
return Val_unit;
}
@@ -606,7 +645,7 @@ value gr_fill_rect (value vx, value vy, value vw, value vh)
XY;
long w = Long_val (vw), h = Long_val (vh);
Rect r;
-
+
gr_check_open ();
BeginOff
SetRect (&r, Bx (x), By (y+h), Bx (x+w), By (y));
@@ -622,10 +661,10 @@ value gr_fill_poly (value vpoints)
{
long i, n = Wosize_val (vpoints);
PolyHandle p;
-
+
#define Bxx(i) Bx (Field (Field (vpoints, (i)), 0))
#define Byy(i) By (Field (Field (vpoints, (i)), 1))
-
+
gr_check_open ();
if (n < 1) return Val_unit;
@@ -645,6 +684,7 @@ value gr_fill_poly (value vpoints)
value gr_fill_arc (value *argv, int argc)
{
+#pragma unused (argc)
return gr_fill_arc_nat (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
}
@@ -656,7 +696,7 @@ value gr_fill_arc_nat (value vx, value vy, value vrx, value vry, value va1,
long a1 = Long_val (va1), a2 = Long_val (va2);
Rect r;
long qda1 = 90 - a1, qda2 = 90 - a2;
-
+
gr_check_open ();
BeginOff
SetRect (&r, Bx (x-rx), By (y+ry), Bx (x+rx), By (y-ry));
@@ -671,13 +711,16 @@ value gr_fill_arc_nat (value vx, value vy, value vrx, value vry, value va1,
value gr_draw_char (value vchr)
{
char c = Int_val (vchr);
-
+ Point p;
+
gr_check_open ();
BeginOff
DrawChar (c);
+ GetPen (&p);
On
DrawChar (c);
End
+ cur_x = Bx (p.h); cur_y = By (p.v);
return Val_unit;
}
@@ -685,14 +728,17 @@ value gr_draw_string (value vstr)
{
mlsize_t len = string_length (vstr);
char *str = String_val (vstr);
+ Point p;
gr_check_open ();
if (len > 32767) len = 32767;
BeginOff
DrawText (str, 0, len);
+ GetPen (&p);
On
DrawText (str, 0, len);
End
+ cur_x = Bx (p.h); cur_y = By (p.v);
return Val_unit;
}
@@ -700,7 +746,7 @@ value gr_set_font (value vfontname)
{
Str255 pfontname;
short fontnum;
-
+
gr_check_open ();
CopyCStringToPascal (String_val (vfontname), pfontname);
GetFNum (pfontname, &fontnum);
@@ -709,19 +755,21 @@ value gr_set_font (value vfontname)
On
TextFont (fontnum);
End
+ cur_font = fontnum;
return Val_unit;
}
value gr_set_text_size (value vsz)
{
short sz = Int_val (vsz);
-
+
gr_check_open ();
BeginOff
TextSize (sz);
On
TextSize (sz);
End
+ cur_size = sz;
return Val_unit;
}
@@ -732,7 +780,7 @@ value gr_text_size (value vstr)
value result = alloc_tuple (2);
FontInfo info;
long w, h;
-
+
BeginOff
GetFontInfo (&info);
w = TextWidth (str, 0, len);
@@ -756,7 +804,7 @@ value gr_make_image (value varray)
int has_transp = 0;
CGrafPtr saveport;
GDHandle savegdev;
-
+
gr_check_open ();
if (height == 0) return alloc_image (0, 0);
width = Wosize_val (Field (varray, 0));
@@ -768,7 +816,7 @@ value gr_make_image (value varray)
result = alloc_image (width, height);
w = ((struct grimage *) Bp_val (result))->data;
-
+
LockPixels (GetGWorldPixMap (w));
GetGWorld (&saveport, &savegdev);
SetGWorld ((CGrafPtr) w, NULL);
@@ -784,11 +832,11 @@ value gr_make_image (value varray)
}
}
UnlockPixels (GetGWorldPixMap (w));
-
+
if (has_transp){
Rect r;
QDErr err;
-
+
SetRect (&r, 0, 0, width, height);
err = NewGWorld (&w, 1, &r, NULL, NULL, 0);
if (err != noErr){
@@ -809,9 +857,9 @@ value gr_make_image (value varray)
UnlockPixels (GetGWorldPixMap (w));
((struct grimage *) Bp_val (result))->mask = w;
}
-
+
SetGWorld (saveport, savegdev);
-
+
return result;
}
@@ -828,7 +876,7 @@ value gr_dump_image (value vimage)
GDHandle savegdev;
RGBColor qdcolor;
value line;
-
+
gr_check_open ();
Begin_roots2 (vimage, result);
result = gr_alloc_int_vect (height);
@@ -871,7 +919,7 @@ value gr_draw_image (value vimage, value vx, value vy)
struct grimage *im = (struct grimage *) Bp_val (vimage);
RGBColor forecolor, backcolor;
Rect srcrect, dstrect;
-
+
SetRect (&srcrect, 0, 0, im->width, im->height);
if (im->mask != NULL){
LockPixels (GetGWorldPixMap (im->data));
@@ -1086,7 +1134,7 @@ value gr_sound (value vfreq, value vdur)
long scale;
Handle h;
OSErr err;
-
+
if (dur <= 0 || freq <= 0) return Val_unit;
if (dur > 5000) dur = 5000;
if (freq > 20000) gr_fail ("sound: frequency is too high", NULL);
diff --git a/maccaml/graphprims b/maccaml/graphprims
index adb50c532..11ee110cd 100644
--- a/maccaml/graphprims
+++ b/maccaml/graphprims
@@ -2,6 +2,8 @@ gr_open_graph
gr_close_graph
gr_sigio_signal
gr_sigio_handler
+gr_auto_flush
+gr_flush
gr_clear_graph
gr_size_x
gr_size_y
diff --git a/maccaml/main.h b/maccaml/main.h
index 38633cb7d..dc29e1ee7 100644
--- a/maccaml/main.h
+++ b/maccaml/main.h
@@ -19,6 +19,7 @@
#include <AERegistry.h>
#include <AppleEvents.h>
+#include <ControlDefinitions.h>
#include <Controls.h>
#include <Devices.h>
#include <Dialogs.h>
diff --git a/maccaml/menus.c b/maccaml/menus.c
index 768316765..ab9ce77f3 100644
--- a/maccaml/menus.c
+++ b/maccaml/menus.c
@@ -16,6 +16,7 @@
static void DoAppleChoice (short item, EventModifiers mods)
{
+#pragma unused (mods)
if (item == kItemAbout){
OpenAboutBox ();
}else{
@@ -49,6 +50,7 @@ OSErr DoQuit ()
static void DoFileChoice (short item, EventModifiers mods)
{
+#pragma unused (mods)
WindowPtr w = FrontWindow ();
switch (item){
@@ -85,6 +87,7 @@ static void DoFileChoice (short item, EventModifiers mods)
static void DoEditChoice (short item, EventModifiers mods)
{
+#pragma unused (mods)
WindowPtr w = FrontWindow ();
WEReference we = WinGetWE (w);
@@ -147,6 +150,7 @@ static long winTableLen = 0; /* number of entries in the table */
static void DoWindowsChoice (short item, EventModifiers mods)
{
+#pragma unused (mods)
switch (item){
case 1:
Assert (winToplevel != NULL);
diff --git a/maccaml/numprims b/maccaml/numprims
index 1570e3aeb..b0b74c330 100644
--- a/maccaml/numprims
+++ b/maccaml/numprims
@@ -1,3 +1,4 @@
+initialize_nat
create_nat
set_to_zero_nat
blit_nat
diff --git a/maccaml/windows.c b/maccaml/windows.c
index ea56f1755..f9676f968 100644
--- a/maccaml/windows.c
+++ b/maccaml/windows.c
@@ -25,6 +25,7 @@ static pascal StyledLineBreakCode CharBreak
(Ptr pText, SInt32 textLength, SInt32 textStart, SInt32 textEnd,
Fixed *textWidth, SInt32 *textOffset, WEHandle hWE)
{
+#pragma unused (textLength, hWE)
long base = textStart;
long len = textEnd - textStart;
long l = 0;
@@ -497,6 +498,7 @@ void WinDoKey (WindowPtr w, short chr, EventRecord *e)
void WinDoZoom (WindowPtr w, short partCode)
{
+#pragma unused (w, partCode)
XXX ();
}
diff --git a/otherlibs/graph/graphics.mli b/otherlibs/graph/graphics.mli
index 086a9d277..a9aa07d3b 100644
--- a/otherlibs/graph/graphics.mli
+++ b/otherlibs/graph/graphics.mli
@@ -42,19 +42,19 @@ external size_y : unit -> int = "gr_size_y"
external auto_flush : bool -> unit = "gr_auto_flush"
(* Set auto-flush mode on/off. When turned off, drawings are done
- in the backing store window but no more in the graphics window
- itself. This creates a simple effect of double buffering, by
- allowing the user to do complex drawings in the backing store
- while keeping older drawings on the screen. The contents
- of the backing store is copied onto the graphics window by
- a call to [flush] (see below). By default, auto-flush mode is
- on, and all drawings are done both in the backing store and in
- the graphics window. *)
+ in the backing store window but no more in the graphics window
+ itself. This creates a simple effect of double buffering, by
+ allowing the user to do complex drawings in the backing store
+ while keeping older drawings on the screen. The contents
+ of the backing store is copied onto the graphics window by
+ a call to [flush] (see below). By default, auto-flush mode is
+ on, and all drawings are done both in the backing store and in
+ the graphics window. *)
external flush : unit -> unit = "gr_flush"
(* Flush the contents of the backing store onto the graphics
- window. This function is automatically called each time
- auto-flush mode is enabled. *)
+ window. This function is automatically called each time
+ auto-flush mode is enabled. *)
(*** Colors *)
@@ -105,7 +105,7 @@ external lineto : x:int -> y:int -> unit = "gr_lineto"
(* Draw a line with endpoints the current point and the given point,
and move the current point to the given point. *)
external draw_arc :
- x:int -> y:int -> rx:int -> ry:int -> start:int -> stop:int -> unit
+ x:int -> y:int -> rx:int -> ry:int -> start:int -> stop:int -> unit
= "gr_draw_arc" "gr_draw_arc_nat"
(* [draw_arc x y rx ry a1 a2] draws an elliptical arc with center
[x,y], horizontal radius [rx], vertical radius [ry], from angle
diff --git a/otherlibs/num/Makefile.Mac b/otherlibs/num/Makefile.Mac
index eff8babe0..ebc624c85 100644
--- a/otherlibs/num/Makefile.Mac
+++ b/otherlibs/num/Makefile.Mac
@@ -16,13 +16,13 @@
# Compilation options
C = sc
-COptions = -model far -i :bignum:h:,:::byterun:
-CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -w s
-CAMLOPT = :::boot:ocamlrun :::ocamlopt: -I :::stdlib: -w s
-
+COptions = -model far -i :bignum:h:,:::byterun: -w 35
PPCC = mrc
PPCCOptions = -i :bignum:h:,:::byterun: -w 35
+CAMLC = :::boot:ocamlrun :::ocamlc -I :::stdlib: -w s
+CAMLOPT = :::boot:ocamlrun :::ocamlopt: -I :::stdlib: -w s
+
CAMLOBJS = int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo ¶
ratio.cmo num.cmo arith_status.cmo
@@ -68,5 +68,6 @@ clean Ä partialclean
nat_stubs.c.o Ä nat.h
depend Ä
- MakeDepend Å.c > Makefile.Mac.depend
+ MakeDepend Å.c > Makefile.Mac.depend · dev:null
+ MakeDepend -objext .x Å.c >> Makefile.Mac.depend · dev:null
:::boot:ocamlrun :::tools:ocamldep Å.mli Å.ml >> Makefile.Mac.depend
diff --git a/otherlibs/num/Makefile.Mac.depend b/otherlibs/num/Makefile.Mac.depend
index 7c0efa715..08121564b 100644
--- a/otherlibs/num/Makefile.Mac.depend
+++ b/otherlibs/num/Makefile.Mac.depend
@@ -1,11 +1,3 @@
-
-"nat_stubs.c.x" Ä nat_stubs.c ¶
- nat.h
-
-
-"nat_stubs.c.o" Ä nat_stubs.c ¶
- nat.h
-
big_int.cmiÄ nat.cmi
num.cmiÄ big_int.cmi nat.cmi ratio.cmi
ratio.cmiÄ big_int.cmi nat.cmi
diff --git a/otherlibs/num/bignum/Makefile.Mac b/otherlibs/num/bignum/Makefile.Mac
index 8246a7d78..2a5d80f28 100644
--- a/otherlibs/num/bignum/Makefile.Mac
+++ b/otherlibs/num/bignum/Makefile.Mac
@@ -1,7 +1,7 @@
# Copyright Digital Equipment Corporation & INRIA 1988, 1989, 1992
C = sc
-COptions = -model far -i :h: -d CAML_LIGHT
+COptions = -model far -i :h: -d CAML_LIGHT -w 30
LinkOptions = -state nouse -compact -model far
Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
"{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
diff --git a/otherlibs/str/Makefile.Mac b/otherlibs/str/Makefile.Mac
index 8bfc2c417..4e3164769 100644
--- a/otherlibs/str/Makefile.Mac
+++ b/otherlibs/str/Makefile.Mac
@@ -61,5 +61,6 @@ install Ä
{CAMLC} -c {COMPFLAGS} {default}.ml
depend Ä
- MakeDepend Å.c > Makefile.Mac.depend
+ MakeDepend Å.c > Makefile.Mac.depend · dev:null
+ MakeDepend -objext .x Å.c >> Makefile.Mac.depend · dev:null
:::boot:ocamlrun :::tools:ocamldep Å.mli Å.ml >> Makefile.Mac.depend
diff --git a/otherlibs/str/Makefile.Mac.depend b/otherlibs/str/Makefile.Mac.depend
index 1730d60cf..84d984a63 100644
--- a/otherlibs/str/Makefile.Mac.depend
+++ b/otherlibs/str/Makefile.Mac.depend
@@ -1,8 +1,2 @@
-
-"strstubs.c.x" Ä strstubs.c
-
-
-"strstubs.c.o" Ä strstubs.c
-
str.cmoÄ str.cmi
str.cmxÄ str.cmi
diff --git a/otherlibs/str/regex-0.12/Makefile.Mac b/otherlibs/str/regex-0.12/Makefile.Mac
index f292e6ddf..f24949d14 100644
--- a/otherlibs/str/regex-0.12/Makefile.Mac
+++ b/otherlibs/str/regex-0.12/Makefile.Mac
@@ -28,10 +28,10 @@ version = 0.12
CPPFLAGS =
C = sc
-COptions = -model far
+COptions = -model far -w 29,35
PPCC = mrc
-PPCCOptions = -w 29 -w 35
+PPCCOptions = -w 29,35
DEFS = -d STDC_HEADERS -d STRING_H -d REGEX_MALLOC
diff --git a/stdlib/Makefile.Mac.depend b/stdlib/Makefile.Mac.depend
index 8a63e7a44..b6b0ff977 100644
--- a/stdlib/Makefile.Mac.depend
+++ b/stdlib/Makefile.Mac.depend
@@ -24,6 +24,10 @@ genlex.cmoÄ char.cmi hashtbl.cmi list.cmi stream.cmi string.cmi genlex.cmi
genlex.cmxÄ char.cmx hashtbl.cmx list.cmx stream.cmx string.cmx genlex.cmi
hashtbl.cmoÄ array.cmi sys.cmi hashtbl.cmi
hashtbl.cmxÄ array.cmx sys.cmx hashtbl.cmi
+int32.cmoÄ int32.cmi
+int32.cmxÄ int32.cmi
+int64.cmoÄ int32.cmi obj.cmi int64.cmi
+int64.cmxÄ int32.cmx obj.cmx int64.cmi
lazy.cmoÄ lazy.cmi
lazy.cmxÄ lazy.cmi
lexing.cmoÄ string.cmi lexing.cmi
@@ -34,6 +38,8 @@ map.cmoÄ map.cmi
map.cmxÄ map.cmi
marshal.cmoÄ string.cmi marshal.cmi
marshal.cmxÄ string.cmx marshal.cmi
+nativeint.cmoÄ sys.cmi nativeint.cmi
+nativeint.cmxÄ sys.cmx nativeint.cmi
obj.cmoÄ marshal.cmi obj.cmi
obj.cmxÄ marshal.cmx obj.cmi
oo.cmoÄ array.cmi hashtbl.cmi list.cmi map.cmi obj.cmi random.cmi sort.cmi ¶
diff --git a/yacc/Makefile.Mac b/yacc/Makefile.Mac
index a43cbb4a7..00bfef15c 100644
--- a/yacc/Makefile.Mac
+++ b/yacc/Makefile.Mac
@@ -15,14 +15,14 @@
# Makefile for the parser generator.
C = sc
-COptions = -d NDEBUG -model far -w 2
+COptions = -d NDEBUG -model far -w 2,35
LinkOptions = -model far -msg nodup -compact -state nouse -br 68k
Libs = "{libraries}IntEnv.far.o" "{libraries}MacRuntime.o" ¶
"{clibraries}StdCLib.far.o" "{libraries}MathLib.far.o" ¶
"{libraries}ToolLibs.o" "{libraries}Interface.o"
PPCC = mrc
-PPCCOptions = -d NDEBUG -w 2 -w 35
+PPCCOptions = -d NDEBUG -w 2,35
PPCLinkOptions = -d
PPCLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o" ¶
"{ppclibraries}PPCToolLibs.o" "{sharedlibraries}StdCLib" ¶
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-20 08:47:22 +0000