Nightly update (ISO SHA-1 29c437f)

TempleOSCD/Compiler/Asm.HC

@@ -891,7 +891,7 @@ U0 PrsBinFile(CCmpCtrl *cc)
   U8 *buf,*st;
   if (cc->token!=TK_STR)
     LexExcept(cc,"Expecting string at ");
-  st=DftExt(cc->cur_str,"BIN");
+  st=ExtDft(cc->cur_str,"BIN");
   buf=FileRead(st,&size);
   Free(st);
   for (i=0;i<size;i++)

TempleOSCD/Compiler/CMain.HC

@@ -428,10 +428,10 @@ I64 Cmp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0)
   CAOTHeapGlblRef *tmphgr,*tmphgr1;
   CAOTHeapGlbl *tmphg,*tmphg1;
 
-  fbuf=DftExt(filename,"PRJ.Z");
+  fbuf=ExtDft(filename,"PRJ.Z");
   fbuf2=MStrPrint("#include \"%s\"",fbuf);
   if (map_name)
-    fbuf3=DftExt(map_name,"MAP.Z");
+    fbuf3=ExtDft(map_name,"MAP.Z");
 
   if (tmpaot=CmpBuf(fbuf2,fbuf3,&error_cnt,&warning_cnt,mapfile_drv_let)) {
     aot_U8s=tmpaot->aot_U8s;
@@ -550,9 +550,9 @@ I64 Cmp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0)
 	  size-aot_U8s-sizeof(CBinFile));
     Free(fbuf2);
     if (out_name)
-      fbuf2=DftExt(out_name,"BIN.Z");
+      fbuf2=ExtDft(out_name,"BIN.Z");
     else
-      fbuf2=ChgExt(fbuf,"BIN.Z");
+      fbuf2=ExtChg(fbuf,"BIN.Z");
     FileWrite(fbuf2,bfh,size);
     Free(bfh);
     Free(tmpaot->buf);
@@ -614,7 +614,7 @@ I64 ExePrint(U8 *fmt,...)
 I64 ExeFile(U8 *name,I64 ccf_flags=0)
 {//JIT Compile and execute a file.
   I64 res;
-  U8 *name2=DftExt(name,"HC.Z"),
+  U8 *name2=ExtDft(name,"HC.Z"),
 	*st=MStrPrint("#include \"%s\";",name2);
   res=ExePutS(st,name,ccf_flags);
   Free(st);
@@ -657,7 +657,7 @@ I64 ExePrint2(U8 *fmt,...)
 I64 ExeFile2(U8 *name,I64 ccf_flags=0)
 {//throws exceptions
   I64 res;
-  U8 *name2=DftExt(name,"HC.Z"),*st=MStrPrint("#include \"%s\";",name2);
+  U8 *name2=ExtDft(name,"HC.Z"),*st=MStrPrint("#include \"%s\";",name2);
   res=ExePutS2(st,name,ccf_flags);
   Free(st);
   Free(name2);

TempleOSCD/Compiler/CMisc.HC

@@ -135,7 +135,7 @@ U8 *CmdLinePmt()
       "%8.6fs ans=0x%08X=%d\n",Fs->answer_time,Fs->answer,Fs->answer;
     Fs->new_answer=FALSE;
   }
-  if (st=CurDir) {
+  if (st=DirCur) {
     "%s",st;
     Free(st);
   }

TempleOSCD/Compiler/CompilerB.HH

@@ -11,6 +11,7 @@ public _extern _LAST_FUN I64 LastFun(I64 argc,I64 *argv);
 public extern I64 RunFile(U8 *name,I64 ccf_flags=0,...);
 public extern I64 RunFile2(U8 *name,I64 ccf_flags=0,...);
 public extern CCmpGlbls cmp;
+
 #help_index "Compiler/Directive"
 #help_file "::/Doc/Directives"
 public extern Bool Echo(Bool val);

TempleOSCD/Compiler/Lex.HC

@@ -698,7 +698,7 @@ lex_float_start:
 	  case KW_INCLUDE:
 	    if (Lex(cc)!=TK_STR)
 	      goto lex_end;
-	    fbuf=DftExt(cc->cur_str,"HC.Z");
+	    fbuf=ExtDft(cc->cur_str,"HC.Z");
 	    buf2=FileNameAbs(fbuf);
 	    Free(fbuf);
 	    if (Bt(&sys_run_level,RLf_DOC))
@@ -1029,7 +1029,7 @@ lex_ifjit:
 	    if (Lex(cc)!=TK_STR)
 	      goto lex_end;
 	    tmph=CAlloc(sizeof(CHashSrcSym));
-	    fbuf=DftExt(cc->cur_str,"DD.Z");
+	    fbuf=ExtDft(cc->cur_str,"DD.Z");
 	    tmph->str=FileNameAbs(fbuf);
 	    Free(fbuf);
 	    tmph->type=HTT_HELP_FILE|HTF_PUBLIC;