commit 95c7b0c0a9f957576a7ff7ebff31f33b77a2444b
parent 450853ce5a51d37482283969e905a39aa9d80620
Author: Alexander Burger <abu@software-lab.de>
Date: Fri, 4 Jan 2013 11:48:39 +0100
'usec' optional 'flg' argument
Diffstat:
11 files changed, 405 insertions(+), 388 deletions(-)
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,5 @@
* DDmmm13 picoLisp-3.1.2
+ 'usec' optional 'flg' argument
JavaScript 'rd' in "lib/plio.js"
'bytes' function
Join multiple namespaces with 'symbols'
diff --git a/doc/refU.html b/doc/refU.html
@@ -405,14 +405,19 @@ a free number. See also <code><a href="refG.html#genKey">genKey</a></code>.
-> 12
</code></pre>
-<dt><a name="usec"><code>(usec) -> num</code></a>
-<dd>Returns the number the microseconds since interpreter startup. See also
-<code><a href="refT.html#time">time</a></code> and <code><a
+<dt><a name="usec"><code>(usec ['flg]) -> num</code></a>
+<dd>Returns the number the microseconds. If <code>flg</code> is
+non-<code>NIL</code>, the microsecond fraction of the last call to <code><a
+href="refT.html#time">time</a></code> is returned, otherwise the number of
+microseconds since interpreter startup. See also <code><a
+href="refD.html#date">date</a></code> and <code><a
href="refT.html#tick">tick</a></code>.
<pre><code>
: (usec)
-> 1154702479219050
+: (list (date (date)) (time (time T)) (usec T))
+-> ((2013 1 4) (10 12 39) 483321)
</code></pre>
</dl>
diff --git a/ersatz/fun.src b/ersatz/fun.src
@@ -1,4 +1,4 @@
-# 08dec12abu
+# 04jan13abu
# (c) Software Lab. Alexander Burger
# Ersatz PicoLisp Functions
@@ -342,9 +342,11 @@ time (i j x z)
j = evInt(x);
return time(i, j, x.Cdr instanceof Cell? evInt(x.Cdr) : 0);
-# (usec) -> num
+# (usec ['flg]) -> num
usec ()
- return new Number(System.nanoTime()/1000 - USec);
+ return new Number(ex.Cdr.Car.eval() == Nil?
+ System.nanoTime()/1000 - USec :
+ Cal.get(Calendar.MILLISECOND) * 1000 );
# (pwd) -> sym
pwd T
@@ -1196,7 +1198,7 @@ xor (x y)
return y == Nil ^ x == Nil? T : Nil;
# (bool 'any) -> flg
-bool ()
+bool T
return ex.Cdr.Car.eval() == Nil? Nil : T;
# (not 'any) -> flg
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/lib/map b/lib/map
@@ -34,7 +34,7 @@ append (1338 . "@src64/subr.l")
apply (713 . "@src64/apply.l")
arg (2573 . "@src64/main.l")
args (2549 . "@src64/main.l")
-argv (3196 . "@src64/main.l")
+argv (3202 . "@src64/main.l")
as (139 . "@src64/flow.l")
asoq (3020 . "@src64/subr.l")
assoc (2985 . "@src64/subr.l")
@@ -66,7 +66,7 @@ call (3096 . "@src64/flow.l")
car (5 . "@src64/subr.l")
case (1965 . "@src64/flow.l")
catch (2467 . "@src64/flow.l")
-cd (2948 . "@src64/main.l")
+cd (2954 . "@src64/main.l")
cdaaar (464 . "@src64/subr.l")
cdaadr (487 . "@src64/subr.l")
cdaar (179 . "@src64/subr.l")
@@ -89,7 +89,7 @@ circ (816 . "@src64/subr.l")
circ? (2402 . "@src64/subr.l")
clip (1799 . "@src64/subr.l")
close (4392 . "@src64/io.l")
-cmd (3178 . "@src64/main.l")
+cmd (3184 . "@src64/main.l")
cnt (1413 . "@src64/apply.l")
co (2548 . "@src64/flow.l")
commit (1403 . "@src64/db.l")
@@ -100,7 +100,7 @@ connect (224 . "@src64/net.l")
cons (747 . "@src64/subr.l")
copy (1225 . "@src64/subr.l")
ctl (4265 . "@src64/io.l")
-ctty (2973 . "@src64/main.l")
+ctty (2979 . "@src64/main.l")
cut (1931 . "@src64/sym.l")
date (2687 . "@src64/main.l")
dbck (2018 . "@src64/db.l")
@@ -112,7 +112,7 @@ del (1986 . "@src64/sym.l")
delete (1401 . "@src64/subr.l")
delq (1452 . "@src64/subr.l")
diff (2589 . "@src64/subr.l")
-dir (3108 . "@src64/main.l")
+dir (3114 . "@src64/main.l")
dm (545 . "@src64/flow.l")
do (2141 . "@src64/flow.l")
e (2928 . "@src64/flow.l")
@@ -129,7 +129,7 @@ extern (1032 . "@src64/sym.l")
extra (1269 . "@src64/flow.l")
extract (1218 . "@src64/apply.l")
fifo (2097 . "@src64/sym.l")
-file (3055 . "@src64/main.l")
+file (3061 . "@src64/main.l")
fill (3255 . "@src64/subr.l")
filter (1161 . "@src64/apply.l")
fin (2033 . "@src64/subr.l")
@@ -167,7 +167,7 @@ ifn (1865 . "@src64/flow.l")
in (4205 . "@src64/io.l")
inc (2256 . "@src64/big.l")
index (2637 . "@src64/subr.l")
-info (3010 . "@src64/main.l")
+info (3016 . "@src64/main.l")
intern (1007 . "@src64/sym.l")
ipid (3215 . "@src64/flow.l")
isa (967 . "@src64/flow.l")
@@ -240,7 +240,7 @@ onOff (1747 . "@src64/sym.l")
one (1780 . "@src64/sym.l")
open (4349 . "@src64/io.l")
opid (3231 . "@src64/flow.l")
-opt (3299 . "@src64/main.l")
+opt (3305 . "@src64/main.l")
or (1640 . "@src64/flow.l")
out (4225 . "@src64/io.l")
pack (1279 . "@src64/sym.l")
@@ -273,7 +273,7 @@ push (1822 . "@src64/sym.l")
push1 (1858 . "@src64/sym.l")
put (2844 . "@src64/sym.l")
putl (3122 . "@src64/sym.l")
-pwd (2937 . "@src64/main.l")
+pwd (2943 . "@src64/main.l")
queue (2054 . "@src64/sym.l")
quit (1285 . "@src64/main.l")
quote (134 . "@src64/flow.l")
@@ -342,7 +342,7 @@ uppc (3469 . "@src64/sym.l")
use (1573 . "@src64/flow.l")
usec (2925 . "@src64/main.l")
val (1597 . "@src64/sym.l")
-version (3313 . "@src64/main.l")
+version (3319 . "@src64/main.l")
wait (3164 . "@src64/io.l")
when (1884 . "@src64/flow.l")
while (2061 . "@src64/flow.l")
diff --git a/src/main.c b/src/main.c
@@ -1,4 +1,4 @@
-/* 28dec12abu
+/* 04jan13abu
* (c) Software Lab. Alexander Burger
*/
@@ -940,16 +940,15 @@ any doDate(any ex) {
any x, z;
int y, m, d, n;
cell c1;
- time_t tim;
if (!isCell(x = cdr(ex))) {
- time(&tim);
- TM = localtime(&tim);
+ gettimeofday(&Tv,NULL);
+ TM = localtime(&Tv.tv_sec);
return mkDat(TM->tm_year+1900, TM->tm_mon+1, TM->tm_mday);
}
if ((z = EVAL(car(x))) == T) {
- time(&tim);
- TM = gmtime(&tim);
+ gettimeofday(&Tv,NULL);
+ TM = gmtime(&Tv.tv_sec);
return mkDat(TM->tm_year+1900, TM->tm_mon+1, TM->tm_mday);
}
if (isNil(z))
@@ -992,12 +991,11 @@ any doTime(any ex) {
any x, z;
int h, m, s;
cell c1;
- time_t tim;
struct tm *p;
if (!isCell(x = cdr(ex))) {
- time(&tim);
- p = localtime(&tim);
+ gettimeofday(&Tv,NULL);
+ p = localtime(&Tv.tv_sec);
return boxCnt(p->tm_hour * 3600 + p->tm_min * 60 + p->tm_sec);
}
if ((z = EVAL(car(x))) == T)
@@ -1018,8 +1016,10 @@ any doTime(any ex) {
return mkTime(h, m, isCell(cdr(x))? evCnt(ex, cdr(x)) : 0);
}
-// (usec) -> num
-any doUsec(any ex __attribute__((unused))) {
+// (usec ['flg]) -> num
+any doUsec(any ex) {
+ if (!isNil(EVAL(cadr(ex))))
+ return boxCnt(Tv.tv_usec);
gettimeofday(&Tv,NULL);
return boxWord2((word2)Tv.tv_sec*1000000 + Tv.tv_usec - USec);
}
diff --git a/src/vers.h b/src/vers.h
@@ -1 +1 @@
-static byte Version[4] = {3,1,1,4};
+static byte Version[4] = {3,1,1,5};
diff --git a/src64/glob.l b/src64/glob.l
@@ -1,4 +1,4 @@
-# 28dec12abu
+# 04jan13abu
# (c) Software Lab. Alexander Burger
(data 'Data)
@@ -19,6 +19,8 @@
: Link word 0 # Saved link register
: Catch word 0 # Catch frames
: Termio word 0 # Raw mode terminal I/O
+: Tv word 0 # 'timeval' structure
+ word 0
: Time word 0 # Pointer to time structure
: USec word 0 # Startup microseconds
: TtyPid word 0 # Terminal process ID
diff --git a/src64/main.l b/src64/main.l
@@ -1,4 +1,4 @@
-# 28dec12abu
+# 04jan13abu
# (c) Software Lab. Alexander Burger
(code 'Code)
@@ -140,10 +140,10 @@
cc signal(SIGPIPE SIG_IGN) # Ignore signals
cc signal(SIGTTIN SIG_IGN)
cc signal(SIGTTOU SIG_IGN)
- cc gettimeofday(Buf 0) # Get time
- ld A (Buf) # tv_sec
+ cc gettimeofday(Tv 0) # Get time
+ ld A (Tv) # tv_sec
mul 1000000 # Convert to microseconds
- add A (Buf I) # tv_usec
+ add A (Tv I) # tv_usec
ld (USec) A # Store
ld X 0 # Runtime expression
call loadAllX_E # Load arguments
@@ -2692,8 +2692,8 @@
ld Y (E CDR) # Y on args
atom Y # Any?
if nz # No
- cc time(Buf) # Get current time
- cc localtime(Buf) # Convert to local time
+ cc gettimeofday(Tv 0) # Get current time
+ cc localtime(Tv) # Convert to local time
ld (Time) A # Keep in 'Time'
ld C A
call tmDateC_E # Extract date
@@ -2702,8 +2702,8 @@
eval
cmp E TSym # T?
if eq # Yes
- cc time(Buf) # Get current time
- cc gmtime(Buf) # Convert to Greenwich Mean Time
+ cc gettimeofday(Tv 0) # Get current time
+ cc gmtime(Tv) # Convert to Greenwich Mean Time
ld (Time) A # Keep in 'Time'
ld C A
call tmDateC_E # Extract date
@@ -2823,8 +2823,8 @@
ld Y (E CDR) # Y on args
atom Y # Any?
if nz # No
- cc time(Buf) # Get current time
- cc localtime(Buf) # Convert to local time
+ cc gettimeofday(Tv 0) # Get current time
+ cc localtime(Tv) # Convert to local time
ld Y A
call tmTimeY_E # Extract time
else
@@ -2921,14 +2921,20 @@
pop X
ret
-# (usec) -> num
+# (usec ['flg]) -> num
(code 'doUsec 2)
- cc gettimeofday(Buf 0) # Get time
- ld A (Buf) # tv_sec
- mul 1000000 # Convert to microseconds
- add A (Buf I) # tv_usec
- sub A (USec) # Diff to startup time
- ld E A
+ ld E ((E CDR)) # Eval arg
+ eval
+ cmp E Nil # NIL?
+ ldnz E (Tv I) # No: tv_usec from last 'time' call
+ if eq # Yes
+ cc gettimeofday(Tv 0) # Get time
+ ld A (Tv) # tv_sec
+ mul 1000000 # Convert to microseconds
+ add A (Tv I) # tv_usec
+ sub A (USec) # Diff to startup time
+ ld E A
+ end
shl E 4 # Make short number
or E CNT
ret
diff --git a/src64/tags b/src64/tags
@@ -162,7 +162,7 @@ sys/x86-64.linux.defs.l,1959
AI_ADDR147,2488
AI_NEXT148,2505
-./glob.l,4297
+./glob.l,4310
Data4,51
AV7,77
AV08,141
@@ -177,236 +177,237 @@ sys/x86-64.linux.defs.l,1959
Link19,648
Catch20,703
Termio21,751
-Time22,808
-USec23,869
-TtyPid24,925
-InFDs25,980
-InFiles26,1044
-OutFDs27,1091
-OutFiles28,1156
-PutBinBZ29,1204
-GetBinZ_FB30,1262
-Seed31,1319
-TickU33,1422
-TickS34,1476
-Slot35,1532
-Spkr36,1579
-Mic37,1630
-SpMiPipe38,1680
-Hear39,1739
-Tell40,1787
-TellBuf41,1838
-Talking42,1884
-Children43,1932
-Child44,1993
-ExtN45,2040
-Extn46,2098
-StrX47,2121
-StrC48,2170
-LineC49,2193
-Break50,2217
-GcCount51,2263
-Sep052,2314
-Sep353,2367
-BufEnd54,2421
-Penv56,2483
-Pnl57,2536
-Signal60,2572
-DBs63,2619
-DbFile64,2680
-DbFiles65,2723
-DbBlock66,2767
-MaxBlkSize67,2815
-BlkIndex68,2869
-BlkLink69,2916
-DbJnl70,2962
-DbLog71,3010
-GcMark74,3086
-Transient75,3095
-Alarm77,3208
-Sigio78,3257
-LineX79,3306
-Lisp80,3354
-LispEnd128,4879
-GcMarkEnd129,4889
-SymTab133,4918
-Nil134,4935
-Pico137,5092
-pico142,5234
-CPU143,5272
-OS144,5311
-DB145,5349
-Meth146,5386
-Quote147,5426
-TSym148,5467
-ISym151,5526
-NSym152,5563
-SSym153,5600
-CSym154,5637
-BSym155,5674
-Solo156,5711
-PPid157,5749
-Pid158,5786
-At159,5821
-At2160,5858
-At3161,5895
-This162,5932
-Prompt163,5969
-Dbg164,6006
-Zap165,6043
-Ext166,6080
-Scl167,6117
-Class168,6155
-Run169,6192
-Hup170,6229
-Sig1171,6266
-Sig2172,6303
-Up173,6340
-Err174,6377
-Msg175,6414
-Uni176,6451
-Led177,6488
-Tsm178,6525
-Adr179,6562
-Fork180,6599
-Bye181,6636
-SymTabEnd560,21198
-TgCPU563,21231
-TgOS564,21273
-Db1568,21364
-Extern570,21391
-GcSymEnd574,21462
-Version577,21491
-EnvCo588,21698
-Chr589,21731
-PutB590,21785
-Get_A591,21846
-InFile592,21906
-OutFile593,21952
-Env594,21999
-EnvBind595,22032
-EnvInFrames596,22105
-EnvOutFrames597,22158
-EnvErrFrames598,22211
-EnvCtlFrames599,22264
-EnvIntern600,22320
-EnvArgs601,22393
-EnvNext602,22442
-EnvCls603,22489
-EnvKey604,22537
-EnvApply605,22583
-EnvMake606,22631
-EnvYoke607,22677
-EnvParseX608,22700
-EnvParseC609,22749
-EnvParseEOF610,22772
-EnvMid611,22796
-EnvCo7612,22824
-EnvTask613,22870
-EnvProtect614,22915
-EnvTrace615,22968
-EnvEnd616,23015
-OrgTermio618,23044
-Flock619,23105
-Tms620,23160
-Addr621,23213
-TBuf623,23273
-CaseBlocks628,23410
-CaseData758,38793
-CaseUpper1095,78674
-CaseLower1119,80500
-Tio1144,82206
-Repl1146,82255
-PRepl1147,82300
-Jam1148,82347
-InBye1149,82392
-Sync1150,82439
-Month1151,82501
-_r_1154,82567
-_w_1155,82584
-_a_1156,82601
-_ap_1157,82618
-_dot_1158,82637
-Giveup1162,82690
-ExecErr1163,82716
-AllocErr1164,82752
-PidSigMsg1165,82781
-QuitMsg1166,82814
-CbErr1167,82835
-HashBlank1169,82879
-Redefined1170,82902
-SuperErr1171,82936
-ExtraErr1172,82965
-ThrowErr1173,82994
-Trc11174,83027
-Trc21175,83045
-SetFD1177,83071
-Delim1178,83096
-DelimEnd1179,83137
-Arrow1180,83148
-RolbLog1182,83175
-IgnLog1183,83236
-CircFree1184,83290
-BadChain1185,83328
-BadCount1186,83357
-ErrTok1188,83394
-Dashes1189,83415
-ProtErr1190,83437
-SymNsErr1191,83472
-StkErr1192,83512
-ArgErr1193,83544
-NumErr1194,83574
-CntErr1195,83607
-SymErr1196,83646
-ExtErr1197,83679
-PairErr1198,83721
-AtomErr1199,83758
-LstErr1200,83790
-VarErr1201,83821
-DivErr1202,83856
-RenErr1203,83879
-MakeErr1204,83909
-ReentErr1205,83938
-YieldErr1206,83977
-MsgErr1207,84009
-BrkErr1208,84038
-OpenErr1209,84064
-CloseErr1210,84097
-PipeErr1211,84132
-ForkErr1212,84165
-WaitPidErr1213,84194
-BadFdErr1214,84224
-NoFdErr1215,84250
-EofErr1216,84282
-SuparErr1217,84311
-BadInput1218,84357
-BadDot1219,84391
-SelectErr1220,84424
-WrBytesErr1221,84461
-WrChildErr1222,84498
-WrSyncErr1223,84535
-WrJnlErr1224,84570
-WrLogErr1225,84607
-TruncErr1226,84640
-DbSyncErr1227,84682
-TrSyncErr1228,84721
-LockErr1229,84769
-DbfErr1230,84801
-JnlErr1231,84830
-IdErr1232,84859
-DbRdErr1233,84882
-DbWrErr1234,84912
-DbSizErr1235,84943
-TellErr1236,84974
-IpSocketErr1237,85006
-IpGetsocknameErr1238,85048
-IpV6onlyErr1239,85100
-IpReuseaddrErr1240,85147
-IpBindErr1241,85198
-IpListenErr1242,85236
-UdpOvflErr1243,85278
-UndefErr1244,85312
-DlErr1245,85341
+Tv22,808
+Time24,886
+USec25,947
+TtyPid26,1003
+InFDs27,1058
+InFiles28,1122
+OutFDs29,1169
+OutFiles30,1234
+PutBinBZ31,1282
+GetBinZ_FB32,1340
+Seed33,1397
+TickU35,1500
+TickS36,1554
+Slot37,1610
+Spkr38,1657
+Mic39,1708
+SpMiPipe40,1758
+Hear41,1817
+Tell42,1865
+TellBuf43,1916
+Talking44,1962
+Children45,2010
+Child46,2071
+ExtN47,2118
+Extn48,2176
+StrX49,2199
+StrC50,2248
+LineC51,2271
+Break52,2295
+GcCount53,2341
+Sep054,2392
+Sep355,2445
+BufEnd56,2499
+Penv58,2561
+Pnl59,2614
+Signal62,2650
+DBs65,2697
+DbFile66,2758
+DbFiles67,2801
+DbBlock68,2845
+MaxBlkSize69,2893
+BlkIndex70,2947
+BlkLink71,2994
+DbJnl72,3040
+DbLog73,3088
+GcMark76,3164
+Transient77,3173
+Alarm79,3286
+Sigio80,3335
+LineX81,3384
+Lisp82,3432
+LispEnd130,4957
+GcMarkEnd131,4967
+SymTab135,4996
+Nil136,5013
+Pico139,5170
+pico144,5312
+CPU145,5350
+OS146,5389
+DB147,5427
+Meth148,5464
+Quote149,5504
+TSym150,5545
+ISym153,5604
+NSym154,5641
+SSym155,5678
+CSym156,5715
+BSym157,5752
+Solo158,5789
+PPid159,5827
+Pid160,5864
+At161,5899
+At2162,5936
+At3163,5973
+This164,6010
+Prompt165,6047
+Dbg166,6084
+Zap167,6121
+Ext168,6158
+Scl169,6195
+Class170,6233
+Run171,6270
+Hup172,6307
+Sig1173,6344
+Sig2174,6381
+Up175,6418
+Err176,6455
+Msg177,6492
+Uni178,6529
+Led179,6566
+Tsm180,6603
+Adr181,6640
+Fork182,6677
+Bye183,6714
+SymTabEnd562,21276
+TgCPU565,21309
+TgOS566,21351
+Db1570,21442
+Extern572,21469
+GcSymEnd576,21540
+Version579,21569
+EnvCo590,21776
+Chr591,21809
+PutB592,21863
+Get_A593,21924
+InFile594,21984
+OutFile595,22030
+Env596,22077
+EnvBind597,22110
+EnvInFrames598,22183
+EnvOutFrames599,22236
+EnvErrFrames600,22289
+EnvCtlFrames601,22342
+EnvIntern602,22398
+EnvArgs603,22471
+EnvNext604,22520
+EnvCls605,22567
+EnvKey606,22615
+EnvApply607,22661
+EnvMake608,22709
+EnvYoke609,22755
+EnvParseX610,22778
+EnvParseC611,22827
+EnvParseEOF612,22850
+EnvMid613,22874
+EnvCo7614,22902
+EnvTask615,22948
+EnvProtect616,22993
+EnvTrace617,23046
+EnvEnd618,23093
+OrgTermio620,23122
+Flock621,23183
+Tms622,23238
+Addr623,23291
+TBuf625,23351
+CaseBlocks630,23488
+CaseData760,38871
+CaseUpper1097,78752
+CaseLower1121,80578
+Tio1146,82284
+Repl1148,82333
+PRepl1149,82378
+Jam1150,82425
+InBye1151,82470
+Sync1152,82517
+Month1153,82579
+_r_1156,82645
+_w_1157,82662
+_a_1158,82679
+_ap_1159,82696
+_dot_1160,82715
+Giveup1164,82768
+ExecErr1165,82794
+AllocErr1166,82830
+PidSigMsg1167,82859
+QuitMsg1168,82892
+CbErr1169,82913
+HashBlank1171,82957
+Redefined1172,82980
+SuperErr1173,83014
+ExtraErr1174,83043
+ThrowErr1175,83072
+Trc11176,83105
+Trc21177,83123
+SetFD1179,83149
+Delim1180,83174
+DelimEnd1181,83215
+Arrow1182,83226
+RolbLog1184,83253
+IgnLog1185,83314
+CircFree1186,83368
+BadChain1187,83406
+BadCount1188,83435
+ErrTok1190,83472
+Dashes1191,83493
+ProtErr1192,83515
+SymNsErr1193,83550
+StkErr1194,83590
+ArgErr1195,83622
+NumErr1196,83652
+CntErr1197,83685
+SymErr1198,83724
+ExtErr1199,83757
+PairErr1200,83799
+AtomErr1201,83836
+LstErr1202,83868
+VarErr1203,83899
+DivErr1204,83934
+RenErr1205,83957
+MakeErr1206,83987
+ReentErr1207,84016
+YieldErr1208,84055
+MsgErr1209,84087
+BrkErr1210,84116
+OpenErr1211,84142
+CloseErr1212,84175
+PipeErr1213,84210
+ForkErr1214,84243
+WaitPidErr1215,84272
+BadFdErr1216,84302
+NoFdErr1217,84328
+EofErr1218,84360
+SuparErr1219,84389
+BadInput1220,84435
+BadDot1221,84469
+SelectErr1222,84502
+WrBytesErr1223,84539
+WrChildErr1224,84576
+WrSyncErr1225,84613
+WrJnlErr1226,84648
+WrLogErr1227,84685
+TruncErr1228,84718
+DbSyncErr1229,84760
+TrSyncErr1230,84799
+LockErr1231,84847
+DbfErr1232,84879
+JnlErr1233,84908
+IdErr1234,84937
+DbRdErr1235,84960
+DbWrErr1236,84990
+DbSizErr1237,85021
+TellErr1238,85052
+IpSocketErr1239,85084
+IpGetsocknameErr1240,85126
+IpV6onlyErr1241,85178
+IpReuseaddrErr1242,85225
+IpBindErr1243,85276
+IpListenErr1244,85314
+UdpOvflErr1245,85356
+UndefErr1246,85390
+DlErr1247,85419
./main.l,2244
Code4,51
@@ -419,114 +420,114 @@ sys/x86-64.linux.defs.l,1959
RetT25,285
RetE_E28,320
main33,402
-restart154,4016
-loadAllX_E162,4178
-giveupX180,4586
-execErrS187,4699
-iSignalCE192,4799
-allocC_A202,5082
-allocAE_A207,5191
-NoMemory211,5305
-heapAlloc217,5384
-sighandler0238,5888
-sighandlerX245,5965
-sighandlerE252,6042
-sig344,9337
-sigTerm356,9561
-sigChld367,9779
-tcSetC388,10287
-sigTermStop401,10554
-setRaw417,11047
-setCooked443,11846
-doRaw451,12013
-doAlarm473,12416
-doSigio489,12700
-doProtect509,13167
-doHeap519,13327
-doStack548,13951
-doAdr587,14794
-doEnv599,15012
-doTrail698,17722
-doUp766,19320
-circE_YF845,21008
-equalAE_F877,21748
-compareAE_F1010,24957
-binSizeX_A1172,28433
-memberXY_FY1267,31043
-doQuit1285,31394
-evExprCE_E1303,31811
-evListE_E1451,35445
-sharedLibC_FA1504,36581
-doErrno1575,38225
-doNative1583,38389
-natBufACZ_CZ1787,44191
-natRetACE_CE1886,46676
-doStruct2035,52076
-fetchCharC_AC2078,52956
-cbl2113,53825
-cbl12146,54541
-cbl22150,54657
-cbl32154,54703
-cbl42158,54755
-cbl52162,54807
-cbl62166,54859
-cbl72170,54911
-cbl82174,54963
-cbl92178,55015
-cbl102182,55067
-cbl112186,55120
-cbl122190,55174
-cbl132194,55228
-cbl142198,55282
-cbl152202,55336
-cbl162206,55390
-cbl172210,55444
-cbl182214,55498
-cbl192218,55552
-cbl202222,55606
-cbl212226,55660
-cbl222230,55714
-cbl232234,55768
-cbl242238,55822
-doLisp2244,55905
-lisp2288,56931
-execE2334,58045
-runE_E2346,58200
-funqE_FE2358,58352
-evSymX_E2420,59775
-evSymY_E2423,59833
-evSymE_E2425,59875
-xSymE_E2427,59912
-evCntXY_FE2448,60277
-evCntEX_FE2450,60321
-xCntEX_FE2452,60360
-xCntCX_FC2461,60537
-xCntAX_FA2470,60714
-boxE_E2479,60891
-putStringB2499,61348
-begString2511,61562
-endString_E2522,61788
-msec_A2536,62111
-doArgs2549,62385
-doNext2556,62499
-doArg2573,62815
-doRest2602,63457
-tmDateC_E2616,63704
-dateXYZ_E2626,63881
-doDate2687,65242
-tmTimeY_E2803,68837
-doTime2820,69170
-doUsec2925,72149
-doPwd2937,72415
-doCd2948,72670
-doCtty2973,73286
-doInfo3010,74220
-doFile3055,75315
-doDir3108,76551
-doCmd3178,78169
-doArgv3196,78628
-doOpt3299,81174
-doVersion3313,81505
+restart154,4013
+loadAllX_E162,4175
+giveupX180,4583
+execErrS187,4696
+iSignalCE192,4796
+allocC_A202,5079
+allocAE_A207,5188
+NoMemory211,5302
+heapAlloc217,5381
+sighandler0238,5885
+sighandlerX245,5962
+sighandlerE252,6039
+sig344,9334
+sigTerm356,9558
+sigChld367,9776
+tcSetC388,10284
+sigTermStop401,10551
+setRaw417,11044
+setCooked443,11843
+doRaw451,12010
+doAlarm473,12413
+doSigio489,12697
+doProtect509,13164
+doHeap519,13324
+doStack548,13948
+doAdr587,14791
+doEnv599,15009
+doTrail698,17719
+doUp766,19317
+circE_YF845,21005
+equalAE_F877,21745
+compareAE_F1010,24954
+binSizeX_A1172,28430
+memberXY_FY1267,31040
+doQuit1285,31391
+evExprCE_E1303,31808
+evListE_E1451,35442
+sharedLibC_FA1504,36578
+doErrno1575,38222
+doNative1583,38386
+natBufACZ_CZ1787,44188
+natRetACE_CE1886,46673
+doStruct2035,52073
+fetchCharC_AC2078,52953
+cbl2113,53822
+cbl12146,54538
+cbl22150,54654
+cbl32154,54700
+cbl42158,54752
+cbl52162,54804
+cbl62166,54856
+cbl72170,54908
+cbl82174,54960
+cbl92178,55012
+cbl102182,55064
+cbl112186,55117
+cbl122190,55171
+cbl132194,55225
+cbl142198,55279
+cbl152202,55333
+cbl162206,55387
+cbl172210,55441
+cbl182214,55495
+cbl192218,55549
+cbl202222,55603
+cbl212226,55657
+cbl222230,55711
+cbl232234,55765
+cbl242238,55819
+doLisp2244,55902
+lisp2288,56928
+execE2334,58042
+runE_E2346,58197
+funqE_FE2358,58349
+evSymX_E2420,59772
+evSymY_E2423,59830
+evSymE_E2425,59872
+xSymE_E2427,59909
+evCntXY_FE2448,60274
+evCntEX_FE2450,60318
+xCntEX_FE2452,60357
+xCntCX_FC2461,60534
+xCntAX_FA2470,60711
+boxE_E2479,60888
+putStringB2499,61345
+begString2511,61559
+endString_E2522,61785
+msec_A2536,62108
+doArgs2549,62382
+doNext2556,62496
+doArg2573,62812
+doRest2602,63454
+tmDateC_E2616,63701
+dateXYZ_E2626,63878
+doDate2687,65239
+tmTimeY_E2803,68850
+doTime2820,69183
+doUsec2925,72177
+doPwd2943,72594
+doCd2954,72849
+doCtty2979,73465
+doInfo3016,74399
+doFile3061,75494
+doDir3114,76730
+doCmd3184,78348
+doArgv3202,78807
+doOpt3305,81353
+doVersion3319,81684
./big.l,1059
zapZeroA_A6,106
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 29dec12abu
+# 04jan13abu
# (c) Software Lab. Alexander Burger
-(de *Version 3 1 1 4)
+(de *Version 3 1 1 5)
# vi:et:ts=3:sw=3
