factor: fix renaming bugs

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 95222ada286f50721c7349d0705fb44a939faf11..af3e57336e1640251a3e19fca9a4792bc112134a 100644 (file)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -124,14 +124,14 @@ DEFER: ?make-staging-image
         [ "invalid vocab manifest!" throw ] if
     ] if-empty ;
 
-:: make-deploy-image ( vm-path image vocab config -- manifest )
+:: make-deploy-image ( vm image vocab config -- manifest )
     make-boot-image
     config [
         bootstrap-profile :> profile
         vocab "vocab-manifest-" prepend temp-file :> manifest-file
-        image-path vocab manifest-file profile deploy-command-line :> flags
+        image vocab manifest-file profile deploy-command-line :> flags
         profile ?make-staging-image
-        vm-path flags run-factor
+        vm flags run-factor
         manifest-file parse-vocab-manifest-file
     ] with-variables ;
 

diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor
index aad93130de918eb11445df24a957fd2007818051..f157e322a81185555952f73c6f1e9618ea838518 100755 (executable)
--- a/extra/gpu/render/render.factor
+++ b/extra/gpu/render/render.factor
@@ -486,8 +486,8 @@ DEFER: [bind-uniform-tuple]
     { uniforms-cleave 2cleave } >quotation ;
 
 :: [bind-uniforms] ( superclass uniforms -- quot )
-    superclass-of "uniform-tuple-texture-units" word-prop 0 or :> first-texture-unit
-    superclass-of \ (bind-uniforms) lookup-method :> next-method
+    superclass "uniform-tuple-texture-units" word-prop 0 or :> first-texture-unit
+    superclass \ (bind-uniforms) lookup-method :> next-method
     first-texture-unit uniforms "" [bind-uniform-tuple] nip :> bind-quot
 
     { 2dup next-method } bind-quot [ ] append-as ;