From 107ed7e85c68091c926d82ea6fd90dfa4a55398e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 28 May 2010 18:11:00 +0000 Subject: Clean up MAKEPROP uses --- src/interp/buildom.boot | 2 +- src/interp/c-util.boot | 2 +- src/interp/compiler.boot | 2 +- src/interp/g-opt.boot | 2 +- src/interp/g-util.boot | 2 +- src/interp/i-output.boot | 4 ++-- src/interp/i-spec2.boot | 2 +- src/interp/lisplib.boot | 8 ++++---- src/interp/mark.boot | 10 +++++----- src/interp/parse.boot | 2 +- src/interp/postpar.boot | 2 +- src/interp/scan.boot | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/interp') diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index e0a8bb71..1d819628 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -419,5 +419,5 @@ for x in '((Record mkRecordFunList) (Mapping mkMappingFunList) (Enumeration mkEnumerationFunList)) repeat - MAKEPROP(first x, "makeFunctionList", second x) + property(first x, 'makeFunctionList) := second x diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 16532e20..459ef90e 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -1286,7 +1286,7 @@ backendCompileILAM: (%Symbol,%List, %Code) -> %Symbol backendCompileILAM(name,args,body) == args' := NLIST(#args, ["GENSYM"]) body' := eqSubst(args',args,body) - MAKEPROP(name,"ILAM",true) + property(name,'ILAM) := true setDynamicBinding(name,["LAMBDA",args',:body']) name diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index b98e3349..9ee54315 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -2601,4 +2601,4 @@ for x in [["|", :"compSuchthat"],_ ["%Match",:"compMatch"],_ ["%SignatureImport",:"compSignatureImport"],_ ["[||]", :"compileQuasiquote"]] repeat - MAKEPROP(first x, "SPECIAL", rest x) + property(first x, 'SPECIAL) := rest x diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 6e0ea498..edcdb00e 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -614,6 +614,6 @@ for x in '( (%Call optCall) _ (RECORDELT optRECORDELT)_ (SETRECORDELT optSETRECORDELT)_ (RECORDCOPY optRECORDCOPY)) _ - repeat MAKEPROP(first x,'OPTIMIZE, second x) + repeat property(first x,'OPTIMIZE) := second x --much quicker to call functions if they have an SBC diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 95943989..45b43dc8 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -245,7 +245,7 @@ for x in [ ["%bind",:function expandBind], ["%store",:function expandStore], ["%dynval",:function expandDynval] - ] repeat MAKEPROP(first x,"%Expander", rest x) + ] repeat property(first x,"%Expander") := rest x ++ Return the expander of a middle-end opcode, or nil if there is none. getOpcodeExpander op == diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index e7875ffe..881d0b22 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -310,7 +310,7 @@ for x in '((+ WIDTH sumWidth) (ZAG SUPERSPAN zagSuper) (ZAG WIDTH zagWidth)) repeat - MAKEPROP(first x, second x, third x) + property(first x, second x) := third x for x in '((+ APP plusApp) @@ -380,7 +380,7 @@ for x in '((+ APP plusApp) (BRACE APP braceApp) (BRACE WIDTH qTWidth)) repeat - MAKEPROP(first x, second x, third x) + property(first x, second x) := third x --% diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot index 989ca1da..a77b92e1 100644 --- a/src/interp/i-spec2.boot +++ b/src/interp/i-spec2.boot @@ -1224,5 +1224,5 @@ up%Add t == for name in $specialOps repeat functionName:=INTERNL('up,name) - MAKEPROP(name,'up,functionName) + property(name,'up) := functionName diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 20373477..f8a9c511 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -175,10 +175,10 @@ loadLib cname == -- in following, add property value false or NIL to possibly clear -- old value if null rest getConstructorFormFromDB cname then - MAKEPROP(cname,'NILADIC,'T) + property(cname,'NILADIC) := true else REMPROP(cname,'NILADIC) - MAKEPROP(cname,'LOADED,fullLibName) + property(cname,'LOADED) := fullLibName if $InteractiveMode then $CategoryFrame := $EmptyEnvironment stopTimingProcess 'load 'T @@ -196,7 +196,7 @@ loadLibNoUpdate(cname, libName, fullLibName) == else clearConstructorCache cname installConstructor(cname,kind) - MAKEPROP(cname,'LOADED,fullLibName) + property(cname,'LOADED) := fullLibName if $InteractiveMode then $CategoryFrame := $EmptyEnvironment stopTimingProcess 'load 'T @@ -454,7 +454,7 @@ finalizeLisplib libName == lisplibWrite('"slot1Info",removeZeroOne $lisplibSlot1,$libFile) if $profileCompiler then profileWrite() if $lisplibForm and null rest $lisplibForm then - MAKEPROP(first $lisplibForm,'NILADIC,'T) + property(first $lisplibForm,'NILADIC) := true leaveIfErrors libName true diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 06f3a1fb..00d66e9b 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -47,9 +47,9 @@ namespace BOOT REMPROP("and",'parseTran) REMPROP("or",'parseTran) REMPROP("not",'parseTran) -MAKEPROP("and",'special,'compAnd) -MAKEPROP("or",'special,'compOr) -MAKEPROP("not",'special,'compNot) +property("and",'special) := 'compAnd +property("or",'special) := 'compOr +property("not",'special) := 'compNot SETQ($monitorWI,nil) SETQ($monitorCoerce,nil) SETQ($markPrimitiveNumbers,nil) -- '(Integer SmallInteger)) @@ -519,7 +519,7 @@ markOrigName x == k := charPosition(char '_;, s, 0) k > MAXINDEX s => nil origName := INTERN SUBSTRING(s, k + 1, nil) - MAKEPROP(op, 'ORIGNAME, origName) + property(op, 'ORIGNAME) := origName REMPROP(op,'PNAME) markOrigName op nil @@ -1541,4 +1541,4 @@ for x in [["%LET", :"compSetq"],_ ["SEQ", :"compSeq"],_ ["SETQ", :"compSetq"],_ ["VECTOR", :"compVector"]] repeat - MAKEPROP(first x, "special", rest x) + property(first x, 'special) := rest x diff --git a/src/interp/parse.boot b/src/interp/parse.boot index 7b366cf2..15d3a802 100644 --- a/src/interp/parse.boot +++ b/src/interp/parse.boot @@ -469,4 +469,4 @@ for x in [["<=", :"parseLessEqual"],_ ["SEQ", :"parseSeq"],_ ["VCONS", :"parseVCONS"],_ ["where", :"parseWhere"]] repeat - MAKEPROP(first x, "parseTran", rest x) + property(first x,'parseTran) := rest x diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot index 5b7939c1..c12ef1a7 100644 --- a/src/interp/postpar.boot +++ b/src/interp/postpar.boot @@ -631,5 +631,5 @@ for x in [["with", :"postWith"],_ ["%Match",:"postMatch"],_ ["^=", :"postBootNotEqual"],_ ["%Comma", :"post%Comma"]] repeat - MAKEPROP(first x, "postTran", rest x) + property(first x, 'postTran) := rest x diff --git a/src/interp/scan.boot b/src/interp/scan.boot index df6f4d8f..51a84342 100644 --- a/src/interp/scan.boot +++ b/src/interp/scan.boot @@ -216,7 +216,7 @@ scanPunCons()== scanPun:=scanPunCons() --for i in ["COLON","MINUS"] repeat --- MAKEPROP(i,'PREGENERIC,'TRUE) +-- property(i,'PREGENERIC) := true for i in [ _ ["EQUAL" ,"="], _ @@ -248,7 +248,7 @@ for i in [ _ ["LARROW" ,"<-"], _ ["BAR" ,"|"], _ ["SEG" ,".."] _ - ] repeat MAKEPROP(first i,'INFGENERIC,second i) + ] repeat property(first i,'INFGENERIC) := second i -- Scanner -- cgit v1.2.3