From 329aed236651c8bd4f1e8cbafd5a80e0af9b4fc7 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 20 Jul 2015 07:54:26 -0700 Subject: [PATCH] factor: fix renaming bugs --- basis/tools/deploy/backend/backend.factor | 6 +++--- extra/gpu/render/render.factor | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor index 95222ada28..af3e57336e 100644 --- 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 aad93130de..f157e322a8 100755 --- 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 ;