diff --git a/H/dhstruct.h b/H/dhstruct.h index db3f862a2..5b5aa5c12 100644 --- a/H/dhstruct.h +++ b/H/dhstruct.h @@ -1,6 +1,6 @@  - /* This file, dhstruct.h , was generated automatically by "yap -L misc/buildheap" - please do not update, update misc/HEAPFIELDS instead */ + /* This file, dhstruct.h, was generated automatically by "yap -L misc/buildheap" + please do not update, update misc/HEAPFIELDS instead */ @@ -86,50 +86,6 @@ #ifdef EUROTRA #define TermDollarU Yap_heap_regs->term_dollar_u #endif -#define TermAppend Yap_heap_regs->term_append -#define TermAtom Yap_heap_regs->term_atomd -#define TermBinary Yap_heap_regs->term_binary -#define TermBoolean Yap_heap_regs->term_boolean -#define TermChars Yap_heap_regs->term_chars -#define TermCodes Yap_heap_regs->term_codes -#define TermCompact Yap_heap_regs->term_compact -#define TermDec10 Yap_heap_regs->term_dec10 -#define TermDots Yap_heap_regs->term_dots -#define TermEof Yap_heap_regs->term_eof -#define TermEOfCode Yap_heap_regs->term_eof_code -#define TermError Yap_heap_regs->term_error -#define TermException Yap_heap_regs->term_exception -#define TermFail Yap_heap_regs->term_fail -#define TermFalse Yap_heap_regs->term_false -#define TermFloat Yap_heap_regs->term_float -#define TermGlobal Yap_heap_regs->term_global -#define TermIgnore Yap_heap_regs->term_ignore -#define TermInteger Yap_heap_regs->term_integer -#define TermMax Yap_heap_regs->term_max -#define TermModule Yap_heap_regs->term_module -#define TermMulti Yap_heap_regs->term_multi -#define TermOff Yap_heap_regs->term_off -#define TermOn Yap_heap_regs->term_on -#define TermPortray Yap_heap_regs->term_portray -#define TermProlog Yap_heap_regs->term_prolog -#define TermQuiet Yap_heap_regs->term_quiet -#define TermRead Yap_heap_regs->term_read -#define TermReadOnly Yap_heap_regs->term_read_only -#define TermReadWrite Yap_heap_regs->term_read_write -#define TermReFoundVar Yap_heap_regs->term_refound_var -#define TermReset Yap_heap_regs->term_reset -#define TermSilent Yap_heap_regs->term_silent -#define TermSingle Yap_heap_regs->term_single -#define TermSource Yap_heap_regs->term_source -#define TermString Yap_heap_regs->term_string -#define TermSymbolChar Yap_heap_regs->term_symbolchar -#define TermTerm Yap_heap_regs->term_term -#define TermText Yap_heap_regs->term_text -#define TermThread Yap_heap_regs->term_thread -#define TermTrue Yap_heap_regs->term_true -#define TermWarning Yap_heap_regs->term_warning -#define TermWrite Yap_heap_regs->term_write -#define TermXml Yap_heap_regs->term_xml #define USER_MODULE Yap_heap_regs->user_module #define IDB_MODULE Yap_heap_regs->idb_module diff --git a/H/hstruct.h b/H/hstruct.h index eca7d727a..748015c67 100755 --- a/H/hstruct.h +++ b/H/hstruct.h @@ -1,6 +1,6 @@  - /* This file, hstruct.h , was generated automatically by "yap -L misc/buildheap" - please do not update, update misc/HEAPFIELDS instead */ + /* This file, hstruct.h, was generated automatically by "yap -L misc/buildheap" + please do not update, update misc/HEAPFIELDS instead */ @@ -86,50 +86,6 @@ #ifdef EUROTRA Term term_dollar_u; #endif - Term term_append; - Term term_atomd; - Term term_binary; - Term term_boolean; - Term term_chars; - Term term_codes; - Term term_compact; - Term term_dec10; - Term term_dots; - Term term_eof; - Term term_eof_code; - Term term_error; - Term term_exception; - Term term_fail; - Term term_false; - Term term_float; - Term term_global; - Term term_ignore; - Term term_integer; - Term term_max; - Term term_module; - Term term_multi; - Term term_off; - Term term_on; - Term term_portray; - Term term_prolog; - Term term_quiet; - Term term_read; - Term term_read_only; - Term term_read_write; - Term term_refound_var; - Term term_reset; - Term term_silent; - Term term_single; - Term term_source; - Term term_string; - Term term_symbolchar; - Term term_term; - Term term_text; - Term term_thread; - Term term_true; - Term term_warning; - Term term_write; - Term term_xml; Term user_module; Term idb_module; diff --git a/H/iatoms.h b/H/iatoms.h index 422e874ab..51f6df404 100644 --- a/H/iatoms.h +++ b/H/iatoms.h @@ -1,4 +1,4 @@ - + /* This file, iatoms.h, was generated automatically by "yap -L misc/buildatoms" please do not update, update misc/ATOMS instead */ @@ -217,6 +217,8 @@ AtomNb = Yap_LookupAtom("nb"); AtomNbTerm = Yap_LookupAtom("nb_term"); AtomNew = Yap_LookupAtom("new"); + AtomNewLine = Yap_LookupAtom("nl"); + AtomNl = Yap_LookupAtom("nl"); AtomNoEffect = Yap_LookupAtom("no_effect"); AtomNoMemory = Yap_LookupAtom("no_memory"); AtomNone = Yap_LookupAtom("none"); @@ -262,7 +264,6 @@ AtomProcedure = Yap_LookupAtom("procedure"); AtomProfile = Yap_FullLookupAtom("$profile"); AtomProlog = Yap_LookupAtom("prolog"); - AtomPtr = Yap_LookupAtom("ptr"); AtomQuery = Yap_LookupAtom("?-"); AtomQueue = Yap_LookupAtom("queue"); AtomQuiet = Yap_LookupAtom("quiet"); @@ -500,7 +501,7 @@ FunctorStreamEOS = Yap_MkFunctor(AtomEndOfStream,1); FunctorStreamPos = Yap_MkFunctor(AtomStreamPos,4); FunctorString1 = Yap_MkFunctor(AtomString,1); - FunctorSyntaxError = Yap_MkFunctor(AtomSyntaxError,5); + FunctorSyntaxError = Yap_MkFunctor(AtomSyntaxError,4); FunctorShortSyntaxError = Yap_MkFunctor(AtomSyntaxError,1); FunctorTermExpansion = Yap_MkFunctor(AtomTermExpansion,2); FunctorThreadRun = Yap_MkFunctor(AtomTopThreadGoal,2); diff --git a/misc/ATOMS b/misc/ATOMS index c498c2fd1..0ed8cb221 100644 --- a/misc/ATOMS +++ b/misc/ATOMS @@ -222,6 +222,8 @@ A Nan N "nan" A Nb N "nb" A NbTerm N "nb_term" A New N "new" +A NewLine N "nl" +A Nl N "nl" A NoEffect N "no_effect" A NoMemory N "no_memory" A None N "none" @@ -267,7 +269,6 @@ A PrivateProcedure N "private_procedure" A Procedure N "procedure" A Profile F "$profile" A Prolog N "prolog" -A Ptr N "ptr" A Query N "?-" A Queue N "queue" A Quiet N "quiet" @@ -505,7 +506,7 @@ F Stream Stream 1 F StreamEOS EndOfStream 1 F StreamPos StreamPos 4 F String1 String 1 -F SyntaxError SyntaxError 5 +F SyntaxError SyntaxError 4 F ShortSyntaxError SyntaxError 1 F TermExpansion TermExpansion 2 F ThreadRun TopThreadGoal 2 diff --git a/misc/buildatoms b/misc/buildatoms index d5793f515..61ca3bca0 100644 --- a/misc/buildatoms +++ b/misc/buildatoms @@ -20,7 +20,8 @@ warning('~n /* This file, ~a, was generated automatically by \"yap -L misc/buil gen_fields(Inp,Out) :- split(Inp," ",["A",Atom,_,_]), !, - append([" Atom Atom",Atom,"_;\n#define Atom",Atom," Yap_heap_regs->Atom",Atom,"_"],Out). + append([" Atom Atom",Atom,"_;\n#define Atom",Atom," Yap_heap_regs->Atom",Atom,"_\n", + "#define Term",Atom," MkAtomTerm( Yap_heap_regs->Atom",Atom,"_ )"],Out). %gen_fields(Inp,Out) :- % split(Inp," ",["A",Atom,_]), !, % append([" Atom Atom_",Atom,"_;\n#define Atom_",Atom," Yap_heap_regs->Atom_",Atom,"_"],Out).