From 02b8a051f014396eabe6fab5e94859855b10ee68 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 13 Aug 2015 19:07:50 -0700 Subject: [PATCH] fix for bad renames. --- basis/opengl/annotations/annotations-docs.factor | 6 +++--- extra/google/translate/translate.factor | 4 ++-- extra/gpu/shaders/shaders.factor | 4 ++-- extra/zeromq/zeromq.factor | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/basis/opengl/annotations/annotations-docs.factor b/basis/opengl/annotations/annotations-docs.factor index 98b5bcc627..d6a73bf83f 100644 --- a/basis/opengl/annotations/annotations-docs.factor +++ b/basis/opengl/annotations/annotations-docs.factor @@ -27,14 +27,14 @@ HELP: log-gl-errors { $description "Annotate every OpenGL function to log using " { $link log-gl-error } " if the function results in an error. Use " { $link reset-gl-functions } " to reverse this operation." } ; HELP: reset-gl-functions -{ $description "Removes any annotations from all OpenGL functions, such as those applied by " { $link gl-errors } " or " { $link log-gl-errors } "." } ; +{ $description "Removes any annotations from all OpenGL functions, such as those applied by " { $link throw-gl-errors } " or " { $link log-gl-errors } "." } ; -{ gl-errors gl-error log-gl-errors log-gl-error clear-gl-error-log reset-gl-functions } related-words +{ throw-gl-errors gl-error log-gl-errors log-gl-error clear-gl-error-log reset-gl-functions } related-words ARTICLE: "opengl.annotations" "OpenGL error reporting" "The " { $vocab-link "opengl.annotations" } " vocabulary provides some tools for tracking down GL errors:" { $subsections - gl-errors + throw-gl-errors log-gl-errors clear-gl-error-log reset-gl-functions diff --git a/extra/google/translate/translate.factor b/extra/google/translate/translate.factor index 7a7d195137..2738801ef2 100644 --- a/extra/google/translate/translate.factor +++ b/extra/google/translate/translate.factor @@ -26,8 +26,8 @@ TUPLE: response-error response error ; : check-response ( response -- response ) "responseStatus" over at { { 200 [ ] } - { 400 [ response-error ] } - [ drop response-error ] + { 400 [ throw-response-error ] } + [ drop throw-response-error ] } case ; : query-response>text ( response -- text ) diff --git a/extra/gpu/shaders/shaders.factor b/extra/gpu/shaders/shaders.factor index 108bfa1076..559f46f560 100755 --- a/extra/gpu/shaders/shaders.factor +++ b/extra/gpu/shaders/shaders.factor @@ -473,7 +473,7 @@ DEFER: [ ] [ source>> ] [ kind>> gl-shader-kind ] tri dup gl-shader-ok? [ swap world get \ shader-instance boa window-resource ] - [ compile-shader-error ] if ; + [ throw-compile-shader-error ] if ; : (link-program) ( program shader-instances -- program-instance ) '[ _ [ handle>> ] map ] @@ -488,7 +488,7 @@ DEFER: dup gl-program-ok? [ [ swap world get \ program-instance boa |dispose dup verify-feedback-format ] with-destructors window-resource - ] [ link-program-error ] if ; + ] [ throw-link-program-error ] if ; : link-program ( program -- program-instance ) dup shaders>> [ ] map (link-program) ; diff --git a/extra/zeromq/zeromq.factor b/extra/zeromq/zeromq.factor index 04c2299d09..b92e95f85a 100644 --- a/extra/zeromq/zeromq.factor +++ b/extra/zeromq/zeromq.factor @@ -13,7 +13,7 @@ TUPLE: zmq-error n string ; zmq_errno dup zmq_strerror zmq-error boa throw ; inline : check-zmq-error ( retval -- ) - [ zmq-error ] unless-zero ; inline + [ throw-zmq-error ] unless-zero ; inline : zmq-version ( -- version ) { int int int } [ zmq_version ] with-out-parameters 3array ; @@ -62,7 +62,7 @@ TUPLE: zmq-socket underlying ; : ( context type -- socket ) [ underlying>> ] dip zmq_socket - dup [ zmq-error ] unless + dup [ throw-zmq-error ] unless zmq-socket boa ; M: zmq-socket dispose @@ -90,11 +90,11 @@ M: zmq-socket zmq-setopt : zmq-sendmsg ( socket msg flags -- ) [ [ underlying>> ] bi@ ] dip zmq_sendmsg - 0 < [ zmq-error ] when ; + 0 < [ throw-zmq-error ] when ; : zmq-recvmsg ( socket msg flags -- ) [ [ underlying>> ] bi@ ] dip zmq_recvmsg - 0 < [ zmq-error ] when ; + 0 < [ throw-zmq-error ] when ; : zmq-send ( socket byte-array flags -- ) [ byte-array>zmq-message ] dip