diff options
Diffstat (limited to 'src/interp')
-rw-r--r-- | src/interp/define.boot | 2 | ||||
-rw-r--r-- | src/interp/functor.boot | 4 | ||||
-rw-r--r-- | src/interp/g-opt.boot | 6 | ||||
-rw-r--r-- | src/interp/i-spec1.boot | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index 3d813c18..69d451b2 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1343,7 +1343,7 @@ uncons x == bootStrapError(functorForm,sourceFile) == ['COND, _ ['$bootStrapMode, _ - ['VECTOR,mkTypeForm functorForm,nil,nil,nil,nil,nil]], + ['%veclit,mkTypeForm functorForm,nil,nil,nil,nil,nil]], [''T, ['systemError,['%listlit,'"%b",MKQ functorForm.op,'"%d",'"from", _ '"%b",MKQ namestring sourceFile,'"%d",'"needs to be compiled"]]]] diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 64b66e7d..2ddcff80 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -233,7 +233,7 @@ NewbFVectorCopy(u,domName) == v mkVector u == - u => ['VECTOR,:u] + u => ['%veclit,:u] nil optFunctorBody x == @@ -412,7 +412,7 @@ mkVectorWithDeferral(objects,tag) == -- Basically a mkVector, but spots things that aren't safe to instantiate -- and places them at the end of $ConstantAssignments, so that they get -- called AFTER the constants of $ have been set up. JHD 26.July.89 - ['VECTOR,: + ['%veclit,: [if CONTAINED('$,u) then -- It's not safe to instantiate this now $ConstantAssignments:=[:$ConstantAssignments, ["setShellEntry", diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 1a2fa576..369a43bb 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -298,7 +298,7 @@ compileTimeBindingOf u == optMkRecord ["mkRecord",:u] == u is [x] => ['%listlit,x] #u=2 => ['%makepair,:u] - ["VECTOR",:u] + ['%veclit,:u] optCond (x is ['COND,:l]) == if l is [a,[aa,b]] and aa = '%true and b is ['COND,:c] then @@ -461,8 +461,8 @@ $VMsideEffectFreeOperators == ++ List of simple VM operators $simpleVMoperators == append($VMsideEffectFreeOperators, - ['CONS,'LIST,'VECTOR,'STRINGIMAGE,'FUNCALL,'%gensym, '%lreverse_!, - '%strstc,'%makebitvec,'%makevector, + ['STRINGIMAGE,'FUNCALL,'%gensym, '%lreverse_!, + '%strstc,'%makepair,'%makebitvec,'%makevector, "MAKE-FULL-CVEC","BVEC-MAKE-FULL","COND"]) ++ Return true if the `form' is semi-simple with respect to diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 1a210e38..e7ea5044 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -1084,9 +1084,9 @@ upRecordConstruct(op,l,tar) == for arg in l for ['_:,.,type] in types] len := #l code := - (len = 1) => ["CONS", :argCode, '()] - (len = 2) => ["CONS",:argCode] - ['VECTOR,:argCode] + (len = 1) => ['%listlit,:argCode] + (len = 2) => ['%makepair,:argCode] + ['%veclit,:argCode] putValue(op,object(code,tar)) putModeSet(op,[tar]) |