picolisp

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/picolisp.git/
Log | Files | Refs | README | LICENSE

commit bc62a42674bdc3a4e8e67f8158a6f0f747f73c1c
parent 83b0f6785019593e9122b45ab09f028a3f3a6775
Author: Alexander Burger <abu@software-lab.de>
Date:   Wed,  6 Apr 2011 16:41:22 +0200

Moved all constant message strings from code to data section
Diffstat:
Mlib/tags | 296++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc64/db.l | 7+------
Msrc64/err.l | 58+---------------------------------------------------------
Msrc64/flow.l | 13+++----------
Msrc64/glob.l | 118+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
Msrc64/io.l | 4+---
Msrc64/main.l | 8+-------
7 files changed, 255 insertions(+), 249 deletions(-)

diff --git a/lib/tags b/lib/tags @@ -1,5 +1,5 @@ -! (2856 . "@src64/flow.l") -$ (2958 . "@src64/flow.l") +! (2851 . "@src64/flow.l") +$ (2953 . "@src64/flow.l") % (2570 . "@src64/big.l") & (2805 . "@src64/big.l") * (2389 . "@src64/big.l") @@ -25,28 +25,28 @@ $ (2958 . "@src64/flow.l") >> (2625 . "@src64/big.l") abs (2729 . "@src64/big.l") accept (139 . "@src64/net.l") -adr (606 . "@src64/main.l") -alarm (483 . "@src64/main.l") +adr (602 . "@src64/main.l") +alarm (479 . "@src64/main.l") all (770 . "@src64/sym.l") -and (1620 . "@src64/flow.l") -any (3933 . "@src64/io.l") +and (1616 . "@src64/flow.l") +any (3932 . "@src64/io.l") append (1338 . "@src64/subr.l") apply (713 . "@src64/apply.l") -arg (2273 . "@src64/main.l") -args (2249 . "@src64/main.l") -argv (2894 . "@src64/main.l") -as (146 . "@src64/flow.l") +arg (2267 . "@src64/main.l") +args (2243 . "@src64/main.l") +argv (2888 . "@src64/main.l") +as (144 . "@src64/flow.l") asoq (3001 . "@src64/subr.l") assoc (2966 . "@src64/subr.l") -at (2105 . "@src64/flow.l") +at (2101 . "@src64/flow.l") atom (2381 . "@src64/subr.l") -bind (1358 . "@src64/flow.l") +bind (1354 . "@src64/flow.l") bit? (2746 . "@src64/big.l") -bool (1720 . "@src64/flow.l") -box (821 . "@src64/flow.l") +bool (1716 . "@src64/flow.l") +box (819 . "@src64/flow.l") box? (997 . "@src64/sym.l") by (1669 . "@src64/apply.l") -bye (3437 . "@src64/flow.l") +bye (3430 . "@src64/flow.l") caaaar (271 . "@src64/subr.l") caaadr (288 . "@src64/subr.l") caaar (99 . "@src64/subr.l") @@ -61,11 +61,11 @@ caddar (409 . "@src64/subr.l") cadddr (435 . "@src64/subr.l") caddr (156 . "@src64/subr.l") cadr (45 . "@src64/subr.l") -call (3089 . "@src64/flow.l") +call (3082 . "@src64/flow.l") car (5 . "@src64/subr.l") -case (1961 . "@src64/flow.l") -catch (2463 . "@src64/flow.l") -cd (2649 . "@src64/main.l") +case (1957 . "@src64/flow.l") +catch (2459 . "@src64/flow.l") +cd (2643 . "@src64/main.l") cdaaar (464 . "@src64/subr.l") cdaadr (487 . "@src64/subr.l") cdaar (179 . "@src64/subr.l") @@ -82,68 +82,68 @@ cdddr (245 . "@src64/subr.l") cddr (79 . "@src64/subr.l") cdr (17 . "@src64/subr.l") chain (1141 . "@src64/subr.l") -char (3415 . "@src64/io.l") +char (3414 . "@src64/io.l") chop (1091 . "@src64/sym.l") circ (816 . "@src64/subr.l") circ? (2398 . "@src64/subr.l") clip (1795 . "@src64/subr.l") -close (4339 . "@src64/io.l") -cmd (2876 . "@src64/main.l") +close (4337 . "@src64/io.l") +cmd (2870 . "@src64/main.l") cnt (1413 . "@src64/apply.l") -co (2545 . "@src64/flow.l") -commit (1496 . "@src64/db.l") +co (2540 . "@src64/flow.l") +commit (1494 . "@src64/db.l") con (725 . "@src64/subr.l") conc (781 . "@src64/subr.l") -cond (1915 . "@src64/flow.l") +cond (1911 . "@src64/flow.l") connect (201 . "@src64/net.l") cons (747 . "@src64/subr.l") copy (1225 . "@src64/subr.l") -ctl (4217 . "@src64/io.l") -ctty (2674 . "@src64/main.l") +ctl (4215 . "@src64/io.l") +ctty (2668 . "@src64/main.l") cut (1795 . "@src64/sym.l") -date (2388 . "@src64/main.l") -dbck (2105 . "@src64/db.l") -de (531 . "@src64/flow.l") +date (2382 . "@src64/main.l") +dbck (2103 . "@src64/db.l") +de (529 . "@src64/flow.l") dec (2323 . "@src64/big.l") -def (455 . "@src64/flow.l") +def (453 . "@src64/flow.l") default (1659 . "@src64/sym.l") del (1850 . "@src64/sym.l") delete (1401 . "@src64/subr.l") delq (1452 . "@src64/subr.l") diff (2585 . "@src64/subr.l") -dir (2807 . "@src64/main.l") -dm (543 . "@src64/flow.l") -do (2137 . "@src64/flow.l") -e (2919 . "@src64/flow.l") -echo (4370 . "@src64/io.l") -env (618 . "@src64/main.l") -eof (3492 . "@src64/io.l") -eol (3483 . "@src64/io.l") -err (4197 . "@src64/io.l") -errno (1384 . "@src64/main.l") -eval (182 . "@src64/flow.l") -ext (5100 . "@src64/io.l") +dir (2801 . "@src64/main.l") +dm (541 . "@src64/flow.l") +do (2133 . "@src64/flow.l") +e (2914 . "@src64/flow.l") +echo (4368 . "@src64/io.l") +env (614 . "@src64/main.l") +eof (3491 . "@src64/io.l") +eol (3482 . "@src64/io.l") +err (4195 . "@src64/io.l") +errno (1379 . "@src64/main.l") +eval (180 . "@src64/flow.l") +ext (5098 . "@src64/io.l") ext? (1032 . "@src64/sym.l") extern (898 . "@src64/sym.l") -extra (1262 . "@src64/flow.l") +extra (1259 . "@src64/flow.l") extract (1218 . "@src64/apply.l") fifo (1961 . "@src64/sym.l") -file (2754 . "@src64/main.l") +file (2748 . "@src64/main.l") fill (3236 . "@src64/subr.l") filter (1161 . "@src64/apply.l") fin (2029 . "@src64/subr.l") -finally (2521 . "@src64/flow.l") +finally (2516 . "@src64/flow.l") find (1322 . "@src64/apply.l") fish (1613 . "@src64/apply.l") flg? (2441 . "@src64/subr.l") flip (1695 . "@src64/subr.l") -flush (5075 . "@src64/io.l") +flush (5073 . "@src64/io.l") fold (3341 . "@src64/sym.l") -for (2226 . "@src64/flow.l") -fork (3263 . "@src64/flow.l") +for (2222 . "@src64/flow.l") +fork (3256 . "@src64/flow.l") format (2089 . "@src64/big.l") -free (2047 . "@src64/db.l") -from (3511 . "@src64/io.l") +free (2045 . "@src64/db.l") +from (3510 . "@src64/io.l") full (1075 . "@src64/subr.l") fun? (732 . "@src64/sym.l") gc (432 . "@src64/gc.l") @@ -154,41 +154,41 @@ getl (3030 . "@src64/sym.l") glue (1232 . "@src64/sym.l") gt0 (2716 . "@src64/big.l") head (1816 . "@src64/subr.l") -heap (538 . "@src64/main.l") -hear (3196 . "@src64/io.l") +heap (534 . "@src64/main.l") +hear (3195 . "@src64/io.l") host (184 . "@src64/net.l") -id (1027 . "@src64/db.l") +id (1025 . "@src64/db.l") idx (2035 . "@src64/sym.l") -if (1801 . "@src64/flow.l") -if2 (1820 . "@src64/flow.l") -ifn (1861 . "@src64/flow.l") -in (4157 . "@src64/io.l") +if (1797 . "@src64/flow.l") +if2 (1816 . "@src64/flow.l") +ifn (1857 . "@src64/flow.l") +in (4155 . "@src64/io.l") inc (2256 . "@src64/big.l") index (2633 . "@src64/subr.l") -info (2711 . "@src64/main.l") +info (2705 . "@src64/main.l") intern (873 . "@src64/sym.l") -ipid (3208 . "@src64/flow.l") -isa (958 . "@src64/flow.l") -job (1425 . "@src64/flow.l") -journal (970 . "@src64/db.l") -key (3344 . "@src64/io.l") -kill (3240 . "@src64/flow.l") +ipid (3201 . "@src64/flow.l") +isa (956 . "@src64/flow.l") +job (1421 . "@src64/flow.l") +journal (968 . "@src64/db.l") +key (3343 . "@src64/io.l") +kill (3233 . "@src64/flow.l") last (2040 . "@src64/subr.l") le0 (2691 . "@src64/big.l") length (2737 . "@src64/subr.l") -let (1475 . "@src64/flow.l") -let? (1536 . "@src64/flow.l") -lieu (1156 . "@src64/db.l") -line (3667 . "@src64/io.l") -lines (3820 . "@src64/io.l") +let (1471 . "@src64/flow.l") +let? (1532 . "@src64/flow.l") +lieu (1154 . "@src64/db.l") +line (3666 . "@src64/io.l") +lines (3819 . "@src64/io.l") link (1172 . "@src64/subr.l") -lisp (1951 . "@src64/main.l") +lisp (1946 . "@src64/main.l") list (887 . "@src64/subr.l") listen (151 . "@src64/net.l") -lit (157 . "@src64/flow.l") -load (4134 . "@src64/io.l") -lock (1184 . "@src64/db.l") -loop (2169 . "@src64/flow.l") +lit (155 . "@src64/flow.l") +load (4132 . "@src64/io.l") +lock (1182 . "@src64/db.l") +loop (2165 . "@src64/flow.l") low? (3213 . "@src64/sym.l") lowc (3243 . "@src64/sym.l") lst? (2411 . "@src64/subr.l") @@ -203,15 +203,15 @@ mapcar (987 . "@src64/apply.l") mapcon (1041 . "@src64/apply.l") maplist (933 . "@src64/apply.l") maps (790 . "@src64/apply.l") -mark (1965 . "@src64/db.l") +mark (1963 . "@src64/db.l") match (3121 . "@src64/subr.l") max (2323 . "@src64/subr.l") maxi (1511 . "@src64/apply.l") member (2451 . "@src64/subr.l") memq (2473 . "@src64/subr.l") meta (3133 . "@src64/sym.l") -meth (1086 . "@src64/flow.l") -method (1050 . "@src64/flow.l") +meth (1084 . "@src64/flow.l") +method (1048 . "@src64/flow.l") min (2352 . "@src64/subr.l") mini (1562 . "@src64/apply.l") mix (1260 . "@src64/subr.l") @@ -220,15 +220,15 @@ n0 (2185 . "@src64/subr.l") n== (2083 . "@src64/subr.l") nT (2194 . "@src64/subr.l") name (497 . "@src64/sym.l") -nand (1655 . "@src64/flow.l") -native (1392 . "@src64/main.l") +nand (1651 . "@src64/flow.l") +native (1387 . "@src64/main.l") need (919 . "@src64/subr.l") -new (832 . "@src64/flow.l") -next (2256 . "@src64/main.l") -nil (1738 . "@src64/flow.l") -nond (1938 . "@src64/flow.l") -nor (1676 . "@src64/flow.l") -not (1728 . "@src64/flow.l") +new (830 . "@src64/flow.l") +next (2250 . "@src64/main.l") +nil (1734 . "@src64/flow.l") +nond (1934 . "@src64/flow.l") +nor (1672 . "@src64/flow.l") +not (1724 . "@src64/flow.l") nth (685 . "@src64/subr.l") num? (2422 . "@src64/subr.l") off (1596 . "@src64/sym.l") @@ -236,118 +236,118 @@ offset (2673 . "@src64/subr.l") on (1581 . "@src64/sym.l") onOff (1611 . "@src64/sym.l") one (1644 . "@src64/sym.l") -open (4301 . "@src64/io.l") -opid (3224 . "@src64/flow.l") -opt (2997 . "@src64/main.l") -or (1636 . "@src64/flow.l") -out (4177 . "@src64/io.l") +open (4299 . "@src64/io.l") +opid (3217 . "@src64/flow.l") +opt (2991 . "@src64/main.l") +or (1632 . "@src64/flow.l") +out (4175 . "@src64/io.l") pack (1142 . "@src64/sym.l") pair (2390 . "@src64/subr.l") pass (754 . "@src64/apply.l") pat? (718 . "@src64/sym.l") -path (1238 . "@src64/io.l") -peek (3399 . "@src64/io.l") +path (1237 . "@src64/io.l") +peek (3398 . "@src64/io.l") pick (1369 . "@src64/apply.l") -pipe (4238 . "@src64/io.l") -poll (3288 . "@src64/io.l") +pipe (4236 . "@src64/io.l") +poll (3287 . "@src64/io.l") pool (648 . "@src64/db.l") pop (1771 . "@src64/sym.l") port (5 . "@src64/net.l") -pr (5183 . "@src64/io.l") +pr (5181 . "@src64/io.l") pre? (1409 . "@src64/sym.l") -prin (4999 . "@src64/io.l") -prinl (5013 . "@src64/io.l") -print (5039 . "@src64/io.l") -println (5070 . "@src64/io.l") -printsp (5055 . "@src64/io.l") +prin (4997 . "@src64/io.l") +prinl (5011 . "@src64/io.l") +print (5037 . "@src64/io.l") +println (5068 . "@src64/io.l") +printsp (5053 . "@src64/io.l") prior (2709 . "@src64/subr.l") -prog (1756 . "@src64/flow.l") -prog1 (1764 . "@src64/flow.l") -prog2 (1781 . "@src64/flow.l") +prog (1752 . "@src64/flow.l") +prog1 (1760 . "@src64/flow.l") +prog2 (1777 . "@src64/flow.l") prop (2779 . "@src64/sym.l") -protect (528 . "@src64/main.l") +protect (524 . "@src64/main.l") prove (3523 . "@src64/subr.l") push (1686 . "@src64/sym.l") push1 (1722 . "@src64/sym.l") put (2696 . "@src64/sym.l") putl (2948 . "@src64/sym.l") -pwd (2638 . "@src64/main.l") +pwd (2632 . "@src64/main.l") queue (1918 . "@src64/sym.l") -quit (1101 . "@src64/main.l") -quote (141 . "@src64/flow.l") +quit (1097 . "@src64/main.l") +quote (139 . "@src64/flow.l") rand (2973 . "@src64/big.l") range (997 . "@src64/subr.l") rank (3029 . "@src64/subr.l") -raw (461 . "@src64/main.l") -rd (5117 . "@src64/io.l") -read (2627 . "@src64/io.l") +raw (457 . "@src64/main.l") +rd (5115 . "@src64/io.l") +read (2626 . "@src64/io.l") replace (1499 . "@src64/subr.l") -rest (2302 . "@src64/main.l") +rest (2296 . "@src64/main.l") reverse (1674 . "@src64/subr.l") -rewind (5083 . "@src64/io.l") -rollback (1890 . "@src64/db.l") +rewind (5081 . "@src64/io.l") +rollback (1888 . "@src64/db.l") rot (848 . "@src64/subr.l") -run (313 . "@src64/flow.l") +run (311 . "@src64/flow.l") sect (2537 . "@src64/subr.l") seed (2958 . "@src64/big.l") seek (1275 . "@src64/apply.l") -send (1130 . "@src64/flow.l") -seq (1083 . "@src64/db.l") +send (1128 . "@src64/flow.l") +seq (1081 . "@src64/db.l") set (1480 . "@src64/sym.l") setq (1513 . "@src64/sym.l") -sigio (499 . "@src64/main.l") +sigio (495 . "@src64/main.l") size (2802 . "@src64/subr.l") -skip (3469 . "@src64/io.l") +skip (3468 . "@src64/io.l") sort (3958 . "@src64/subr.l") sp? (709 . "@src64/sym.l") -space (5017 . "@src64/io.l") +space (5015 . "@src64/io.l") split (1588 . "@src64/subr.l") -stack (567 . "@src64/main.l") -state (2005 . "@src64/flow.l") +stack (563 . "@src64/main.l") +state (2001 . "@src64/flow.l") stem (1985 . "@src64/subr.l") -str (3987 . "@src64/io.l") +str (3986 . "@src64/io.l") str? (1011 . "@src64/sym.l") strip (1572 . "@src64/subr.l") sub? (1442 . "@src64/sym.l") sum (1460 . "@src64/apply.l") -super (1217 . "@src64/flow.l") -sym (3973 . "@src64/io.l") +super (1215 . "@src64/flow.l") +sym (3972 . "@src64/io.l") sym? (2430 . "@src64/subr.l") -sync (3156 . "@src64/io.l") -sys (3060 . "@src64/flow.l") -t (1747 . "@src64/flow.l") +sync (3155 . "@src64/io.l") +sys (3053 . "@src64/flow.l") +t (1743 . "@src64/flow.l") tail (1907 . "@src64/subr.l") -tell (3228 . "@src64/io.l") +tell (3227 . "@src64/io.l") text (1270 . "@src64/sym.l") -throw (2489 . "@src64/flow.l") -tick (3176 . "@src64/flow.l") -till (3578 . "@src64/io.l") -time (2521 . "@src64/main.l") +throw (2485 . "@src64/flow.l") +tick (3169 . "@src64/flow.l") +till (3577 . "@src64/io.l") +time (2515 . "@src64/main.l") touch (1047 . "@src64/sym.l") trim (1755 . "@src64/subr.l") -try (1171 . "@src64/flow.l") -type (911 . "@src64/flow.l") +try (1169 . "@src64/flow.l") +type (909 . "@src64/flow.l") udp (268 . "@src64/net.l") unify (3931 . "@src64/subr.l") -unless (1897 . "@src64/flow.l") -until (2081 . "@src64/flow.l") -up (709 . "@src64/main.l") +unless (1893 . "@src64/flow.l") +until (2077 . "@src64/flow.l") +up (705 . "@src64/main.l") upp? (3228 . "@src64/sym.l") uppc (3292 . "@src64/sym.l") -use (1569 . "@src64/flow.l") -usec (2626 . "@src64/main.l") +use (1565 . "@src64/flow.l") +usec (2620 . "@src64/main.l") val (1461 . "@src64/sym.l") -version (3011 . "@src64/main.l") -wait (3118 . "@src64/io.l") -when (1880 . "@src64/flow.l") -while (2057 . "@src64/flow.l") +version (3005 . "@src64/main.l") +wait (3117 . "@src64/io.l") +when (1876 . "@src64/flow.l") +while (2053 . "@src64/flow.l") wipe (3088 . "@src64/sym.l") -with (1326 . "@src64/flow.l") -wr (5200 . "@src64/io.l") +with (1322 . "@src64/flow.l") +wr (5198 . "@src64/io.l") xchg (1536 . "@src64/sym.l") -xor (1697 . "@src64/flow.l") +xor (1693 . "@src64/flow.l") x| (2885 . "@src64/big.l") -yield (2714 . "@src64/flow.l") +yield (2709 . "@src64/flow.l") yoke (1196 . "@src64/subr.l") zap (1061 . "@src64/sym.l") zero (1629 . "@src64/sym.l") diff --git a/src64/db.l b/src64/db.l @@ -1,4 +1,4 @@ -# 03mar11abu +# 06apr11abu # (c) Software Lab. Alexander Burger # 6 bytes in little endian format @@ -917,12 +917,10 @@ pop X ld E TSym # Return T ret -: RolbLog asciz "Last transaction not completed: Rollback\n" (code 'ignLog) cc fprintf((stderr) IgnLog) ret -: IgnLog asciz "Discarding incomplete transaction.\n" (code 'rewindLog) cc fseek((DbLog) 0 SEEK_SET) # Rewind transaction log @@ -2255,8 +2253,5 @@ pop Y pop X ret -: CircFree asciz "Circular free list" -: BadChain asciz "Bad chain" -: BadCount asciz "Bad count" # vi:et:ts=3:sw=3 diff --git a/src64/err.l b/src64/err.l @@ -1,4 +1,4 @@ -# 09mar11abu +# 06apr11abu # (c) Software Lab. Alexander Burger # Debug print routine @@ -160,8 +160,6 @@ ld (StkLimit) 0 # Clear stack limit ld (Stacks) 0 # Free all stack segments jmp restart # Restart interpreter -: ErrTok asciz "!? " -: Dashes asciz " -- " (code 'unwindC_Z 0) push C # <S> Target frame @@ -387,7 +385,6 @@ (code 'protErrEX) ld Y ProtErr jmp errEXYZ -: ProtErr asciz "Protected symbol" ### Error messages ### (code 'stkErr) @@ -400,21 +397,18 @@ ld Y StkErr ld (StkLimit) 0 # Reset stack limit jmp errEXYZ -: StkErr asciz "Stack overflow" (code 'argErrAX) ld E A (code 'argErrEX) ld Y ArgErr jmp errEXYZ -: ArgErr asciz "Bad argument" (code 'numErrAX) ld E A (code 'numErrEX) ld Y NumErr jmp errEXYZ -: NumErr asciz "Number expected" (code 'cntErrAX) ld C A @@ -423,7 +417,6 @@ (code 'cntErrEX) ld Y CntErr jmp errEXYZ -: CntErr asciz "Small number expected" (code 'symErrAX) ld Y A @@ -432,69 +425,58 @@ (code 'symErrEX) ld Y SymErr jmp errEXYZ -: SymErr asciz "Symbol expected" (code 'extErrEX) ld Y ExtErr jmp errEXYZ -: ExtErr asciz "External symbol expected" (code 'cellErrAX) ld E A (code 'cellErrEX) ld Y CellErr jmp errEXYZ -: CellErr asciz "Cell expected" (code 'atomErrAX) ld E A (code 'atomErrEX) ld Y AtomErr jmp errEXYZ -: AtomErr asciz "Atom expected" (code 'lstErrAX) ld E A (code 'lstErrEX) ld Y LstErr jmp errEXYZ -: LstErr asciz "List expected" (code 'varErrAX) ld E A (code 'varErrEX) ld Y VarErr jmp errEXYZ -: VarErr asciz "Variable expected" (code 'divErrX) ld E 0 ld Y DivErr jmp errEXYZ -: DivErr asciz "Div/0" (code 'renErrEX) ld Y RenErr jmp errEXYZ -: RenErr asciz "Can't rename" (code 'makeErrX) ld E 0 ld Y MakeErr jmp errEXYZ -: MakeErr asciz "Not making" (code 'reentErrEX) ld Y ReentErr jmp errEXYZ -: ReentErr asciz "Reentrant coroutine" (code 'yieldErrX) ld E 0 (code 'yieldErrEX) ld Y YieldErr jmp errEXYZ -: YieldErr asciz "No coroutine" (code 'msgErrYX) ld A Y @@ -503,68 +485,57 @@ (code 'msgErrEX) ld Y MsgErr jmp errEXYZ -: MsgErr asciz "Bad message" (code 'brkErrX) ld E 0 ld Y BrkErr jmp errEXYZ -: BrkErr asciz "No Break" # I/O errors (code 'openErrEX) ld Y OpenErr jmp errnoEXY -: OpenErr asciz "Open error: %s" (code 'closeErrX) ld E 0 (code 'closeErrEX) ld Y CloseErr jmp errnoEXY -: CloseErr asciz "Close error: %s" (code 'pipeErrX) ld E 0 ld Y PipeErr jmp errnoEXY -: PipeErr asciz "Pipe error: %s" (code 'forkErrX) ld E 0 ld Y ForkErr jmp errEXYZ -: ForkErr asciz "Can't fork" (code 'waitPidErrX) ld E 0 ld Y WaitPidErr jmp errnoEXY -: WaitPidErr asciz "wait pid" (code 'badFdErrEX) ld Y BadFdErr jmp errEXYZ -: BadFdErr asciz "Bad FD" (code 'noFdErrX) ld E 0 ld Y NoFdErr jmp errEXYZ -: NoFdErr asciz "No current fd" (code 'eofErr) ld E 0 ld X 0 ld Y EofErr jmp errEXYZ -: EofErr asciz "EOF Overrun" (code 'suparErrE) ld X 0 ld Y SuparErr jmp errEXYZ -: SuparErr asciz "Super parentheses mismatch" (code 'badInputErrB) zxt @@ -573,161 +544,136 @@ ld X 0 ld Y BadInput jmp errEXYZ -: BadInput asciz "Bad input '%c'" (code 'badDotErrE) ld X 0 ld Y BadDot jmp errEXYZ -: BadDot asciz "Bad dotted pair" (code 'selectErrX) ld E 0 ld Y SelectErr jmp errnoEXY -: SelectErr asciz "Select error: %s" (code 'wrBytesErr) ld E 0 ld X 0 ld Y WrBytesErr jmp errnoEXY -: WrBytesErr asciz "bytes write: %s" (code 'wrChildErr) ld E 0 ld X 0 ld Y WrChildErr jmp errnoEXY -: WrChildErr asciz "child write: %s" (code 'wrSyncErrX) ld E 0 ld Y WrSyncErr jmp errnoEXY -: WrSyncErr asciz "sync write: %s" (code 'wrJnlErr) ld E 0 ld X 0 ld Y WrJnlErr jmp errnoEXY -: WrJnlErr asciz "Journal write: %s" (code 'wrLogErr) ld E 0 ld X 0 ld Y WrLogErr jmp errnoEXY -: WrLogErr asciz "Log write: %s" (code 'truncErrX) ld E 0 ld Y TruncErr jmp errnoEXY -: TruncErr asciz "Log truncate error: %s" (code 'dbSyncErrX) ld E 0 ld Y DbSyncErr jmp errnoEXY -: DbSyncErr asciz "DB fsync error: %s" (code 'trSyncErrX) ld E 0 ld Y TrSyncErr jmp errnoEXY -: TrSyncErr asciz "Transaction fsync error: %s" (code 'lockErr) ld E 0 ld X 0 ld Y LockErr jmp errnoEXY -: LockErr asciz "File lock: %s" (code 'dbfErrX) ld E 0 ld Y DbfErr jmp errEXYZ -: DbfErr asciz "Bad DB file" (code 'jnlErrX) ld E 0 ld Y JnlErr jmp errEXYZ -: JnlErr asciz "Bad Journal" (code 'idErrXL) ld E (L I) # Get symbol ld Y IdErr jmp errEXYZ -: IdErr asciz "Bad ID" (code 'dbRdErr) ld E 0 ld X 0 ld Y DbRdErr jmp errnoEXY -: DbRdErr asciz "DB read: %s" (code 'dbWrErr) ld E 0 ld X 0 ld Y DbWrErr jmp errnoEXY -: DbWrErr asciz "DB write: %s" (code 'dbSizErr) ld E 0 ld X 0 ld Y DbSizErr jmp errEXYZ -: DbSizErr asciz "DB Oversize" (code 'tellErr) ld E 0 ld X 0 ld Y TellErr jmp errEXYZ -: TellErr asciz "Tell PIPE_BUF" (code 'ipSocketErrX) ld E 0 ld Y IpSocketErr jmp errnoEXY -: IpSocketErr asciz "IP socket error: %s" (code 'ipGetsocknameErrX) ld E 0 ld Y IpGetsocknameErr jmp errnoEXY -: IpGetsocknameErr asciz "IP getsockname error: %s" (code 'ipSetsockoptErrX) ld E 0 ld Y IpSetsockoptErr jmp errnoEXY -: IpSetsockoptErr asciz "IP setsockopt error: %s" (code 'ipBindErrX) ld E 0 ld Y IpBindErr jmp errnoEXY -: IpBindErr asciz "IP bind error: %s" (code 'ipListenErrX) ld E 0 ld Y IpListenErr jmp errnoEXY -: IpListenErr asciz "IP listen error: %s" (code 'udpOvflErr) ld E 0 ld X 0 ld Y UdpOvflErr jmp errEXYZ -: UdpOvflErr asciz "UDP overflow" ### Undefined symbol ### (code 'undefinedCE) @@ -737,7 +683,6 @@ (code 'undefinedEX) ld Y UndefErr jmp errEXYZ -: UndefErr asciz "Undefined" (code 'dlErrX) ld E 0 @@ -745,7 +690,6 @@ ld Y DlErr ld Z A jmp errEXYZ -: DlErr asciz "[DLL] %s" ### Global return labels ### (code 'ret 0) diff --git a/src64/flow.l b/src64/flow.l @@ -1,4 +1,4 @@ -# 04apr11abu +# 06apr11abu # (c) Software Lab. Alexander Burger (code 'redefMsgEC) @@ -21,8 +21,6 @@ pop (PutB) # Restore 'put' pop (OutFile) # and output channel ret -: HashBlank asciz "# " -: Redefined asciz " redefined\\n" (code 'putSrcEC_E) cmp (Dbg) Nil # Debug? @@ -1256,7 +1254,6 @@ pop X # Expression ld Y SuperErr jmp errEXYZ -: SuperErr asciz "Bad super" # (extra ['any ..]) -> any (code 'doExtra 2) @@ -1285,7 +1282,6 @@ pop X # Expression ld Y ExtraErr jmp errEXYZ -: ExtraErr asciz "Bad extra" (code 'extraXY_FCYZ 0) ld X (X) # Get class definition @@ -2515,7 +2511,6 @@ ld E Z ld Y ThrowErr jmp errEXYZ -: ThrowErr asciz "Tag not found" # (finally exe . prg) -> any (code 'doFinally 2) @@ -2975,7 +2970,7 @@ inc (EnvTrace) # Increment trace level ld C (EnvTrace) # Get it call traceCY # Print trace information - ld C trc1 # Print " :" + ld C Trc1 # Print " :" call outStringC ld X (X) # Get 'lst' do @@ -3015,7 +3010,7 @@ ld C (EnvTrace) # Get trace level dec (EnvTrace) # Decrement it call traceCY # Print trace information - ld C trc2 # Print " = " + ld C Trc2 # Print " = " call outStringC call printE_E # Print result call newline @@ -3026,8 +3021,6 @@ end pop X ret -: trc1 asciz " :" -: trc2 asciz " = " (code 'traceCY) cmp C 64 # Limit to 64 diff --git a/src64/glob.l b/src64/glob.l @@ -1,4 +1,4 @@ -# 05apr11abu +# 06apr11abu # (c) Software Lab. Alexander Burger (data 'Data 0) @@ -612,23 +612,6 @@ : TBuf byte (+ INTERN 4) # 'T' in PLIO format byte (char "T") -# Strings -:: _r_ asciz "r" -:: _w_ asciz "w" -:: _a_ asciz "a" -:: _ap_ asciz "a+" -:: _dot_ asciz "." - -# Bytes -:: Tio byte 0 # Terminal I/O - -: Repl byte 0 # REPL flag -: PRepl byte 0 # Parent REPL -: Jam byte 0 # Error jam -: InBye byte 0 # Exit status -: Sync byte 0 # Family IPC synchronization - - # Case mappings from the GNU Kaffe Project align 2 : CaseBlocks @@ -1146,4 +1129,103 @@ hx2 ("0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0" "0") hx2 ("0" "0" "0" "0" "0" "0" "0") +# Bytes +:: Tio byte 0 # Terminal I/O + +: Repl byte 0 # REPL flag +: PRepl byte 0 # Parent REPL +: Jam byte 0 # Error jam +: InBye byte 0 # Exit status +: Sync byte 0 # Family IPC synchronization + +# Strings +:: _r_ asciz "r" +:: _w_ asciz "w" +:: _a_ asciz "a" +:: _ap_ asciz "a+" +:: _dot_ asciz "." + +### System messages ### +# main.l +: Giveup asciz "%d %s\\n" +: ExecErr asciz "%s: Can't exec\\n" +: AllocErr asciz "No memory" +: PidSigMsg asciz "%d SIG-%d\\n" +: QuitMsg asciz "%s" +: CbErr asciz "Too many callbacks" +# flow.l +: HashBlank asciz "# " +: Redefined asciz " redefined\\n" +: SuperErr asciz "Bad super" +: ExtraErr asciz "Bad extra" +: ThrowErr asciz "Tag not found" +: Trc1 asciz " :" +: Trc2 asciz " = " +# io.l +: SetFD asciz "SETFD %s" +: Arrow asciz "-> " +# db.l +: RolbLog asciz "Last transaction not completed: Rollback\n" +: IgnLog asciz "Discarding incomplete transaction.\n" +: CircFree asciz "Circular free list" +: BadChain asciz "Bad chain" +: BadCount asciz "Bad count" +# err.l +: ErrTok asciz "!? " +: Dashes asciz " -- " +: ProtErr asciz "Protected symbol" +: StkErr asciz "Stack overflow" +: ArgErr asciz "Bad argument" +: NumErr asciz "Number expected" +: CntErr asciz "Small number expected" +: SymErr asciz "Symbol expected" +: ExtErr asciz "External symbol expected" +: CellErr asciz "Cell expected" +: AtomErr asciz "Atom expected" +: LstErr asciz "List expected" +: VarErr asciz "Variable expected" +: DivErr asciz "Div/0" +: RenErr asciz "Can't rename" +: MakeErr asciz "Not making" +: ReentErr asciz "Reentrant coroutine" +: YieldErr asciz "No coroutine" +: MsgErr asciz "Bad message" +: BrkErr asciz "No Break" +: OpenErr asciz "Open error: %s" +: CloseErr asciz "Close error: %s" +: PipeErr asciz "Pipe error: %s" +: ForkErr asciz "Can't fork" +: WaitPidErr asciz "wait pid" +: BadFdErr asciz "Bad FD" +: NoFdErr asciz "No current fd" +: EofErr asciz "EOF Overrun" +: SuparErr asciz "Super parentheses mismatch" +: BadInput asciz "Bad input '%c'" +: BadDot asciz "Bad dotted pair" +: SelectErr asciz "Select error: %s" +: WrBytesErr asciz "bytes write: %s" +: WrChildErr asciz "child write: %s" +: WrSyncErr asciz "sync write: %s" +: WrJnlErr asciz "Journal write: %s" +: WrLogErr asciz "Log write: %s" +: TruncErr asciz "Log truncate error: %s" +: DbSyncErr asciz "DB fsync error: %s" +: TrSyncErr asciz "Transaction fsync error: %s" +: LockErr asciz "File lock: %s" +: DbfErr asciz "Bad DB file" +: JnlErr asciz "Bad Journal" +: IdErr asciz "Bad ID" +: DbRdErr asciz "DB read: %s" +: DbWrErr asciz "DB write: %s" +: DbSizErr asciz "DB Oversize" +: TellErr asciz "Tell PIPE_BUF" +: IpSocketErr asciz "IP socket error: %s" +: IpGetsocknameErr asciz "IP getsockname error: %s" +: IpSetsockoptErr asciz "IP setsockopt error: %s" +: IpBindErr asciz "IP bind error: %s" +: IpListenErr asciz "IP listen error: %s" +: UdpOvflErr asciz "UDP overflow" +: UndefErr asciz "Undefined" +: DlErr asciz "[DLL] %s" + # vi:et:ts=3:sw=3 diff --git a/src64/io.l b/src64/io.l @@ -1,4 +1,4 @@ -# 16mar11abu +# 06apr11abu # (c) Software Lab. Alexander Burger # Close file descriptor @@ -46,7 +46,6 @@ jns Ret # Yes ld Y SetFD jmp errnoEXY -: SetFD asciz "SETFD %s" # Set file descriptor to non-blocking / blocking (code 'nonblockingA_A) @@ -4128,7 +4127,6 @@ drop pop Y ret -: Arrow asciz "-> " # (load 'any ..) -> any (code 'doLoad 2) diff --git a/src64/main.l b/src64/main.l @@ -186,13 +186,11 @@ cc fprintf((stderr) Giveup A X) ld E 1 jmp finishE -: Giveup asciz "%d %s\\n" (code 'execErrS) cc fprintf((stderr) ExecErr (S)) ld E 127 jmp finishE -: ExecErr asciz "%s: Can't exec\\n" # Install interrupting signal (code 'iSignalCE) @@ -215,9 +213,8 @@ null A # OK? jnz Ret # Return : NoMemory - ld X Alloc # No memory + ld X AllocErr # No memory jmp giveupX -: Alloc asciz "No memory" # Allocate cell heap @@ -392,7 +389,6 @@ call errnoC return 0 ret -: PidSigMsg asciz "%d SIG-%d\\n" (code 'tcSetC) null (Termio) # In raw mode? @@ -1113,7 +1109,6 @@ ld Y QuitMsg # Format string ld Z S # Buffer pointer jmp errEXYZ # Jump to error handler -: QuitMsg asciz "%s" ### Evaluation ### # Apply EXPR in C to CDR of E @@ -1990,7 +1985,6 @@ until eq ld Y CbErr jmp errEXYZ -: CbErr asciz "Too many callbacks" (code 'lisp 0) begin 6 # Function name in A, arguments in C, E, X, Y and Z