From: John Benediktsson Date: Mon, 1 Dec 2014 16:04:49 +0000 (-0800) Subject: change errors to use "object" instead of "obj". X-Git-Tag: unmaintained~3179 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=ab3f3173af6d1efbdc4c42500ee6d47a639997bf change errors to use "object" instead of "obj". --- diff --git a/basis/heaps/heaps.factor b/basis/heaps/heaps.factor index dccf1e5e55..509ff9279e 100644 --- a/basis/heaps/heaps.factor +++ b/basis/heaps/heaps.factor @@ -184,7 +184,7 @@ M: heap heap-pop ( heap -- value key ) [ dup heap-pop swap 2array ] produce nip ; -ERROR: not-a-heap obj ; +ERROR: not-a-heap object ; : check-heap ( heap -- heap ) dup heap? [ not-a-heap ] unless ; inline diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index ad2f9fea70..544ad0e81e 100644 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -332,7 +332,7 @@ M: error-class reset-class : boa-effect ( class -- effect ) [ all-slots [ name>> ] map ] [ name>> 1array ] bi ; -ERROR: not-a-tuple-class obj ; +ERROR: not-a-tuple-class object ; : check-tuple-class ( class -- class ) dup tuple-class? [ not-a-tuple-class ] unless ; inline diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor index ff244a5bda..b6d07a0f6c 100644 --- a/core/continuations/continuations.factor +++ b/core/continuations/continuations.factor @@ -49,7 +49,7 @@ C: continuation continuation< ( continuation -- data call retain name catch ) dup continuation? [ not-a-continuation ] unless diff --git a/core/lexer/lexer.factor b/core/lexer/lexer.factor index f60babccc0..1dbcb0e2d3 100644 --- a/core/lexer/lexer.factor +++ b/core/lexer/lexer.factor @@ -15,7 +15,7 @@ TUPLE: lexer TUPLE: lexer-parsing-word word line line-text column ; -ERROR: not-a-lexer obj ; +ERROR: not-a-lexer object ; : check-lexer ( lexer -- lexer ) dup lexer? [ not-a-lexer ] unless ; inline diff --git a/extra/gml/core/core.factor b/extra/gml/core/core.factor index ef7d5aab39..dec8142cc2 100644 --- a/extra/gml/core/core.factor +++ b/extra/gml/core/core.factor @@ -77,7 +77,7 @@ GML: sort-number-permutation ( array -- permutation ) zip-index sort-keys reverse values ; ! Dictionaries -ERROR: not-a-dict obj ; +ERROR: not-a-dict object ; : check-dict ( obj -- obj' ) dup hashtable? [ not-a-dict ] unless ; inline GML: begin ( dict -- ) check-dict over dictionary-stack>> push ; @@ -105,7 +105,7 @@ GML: where ( key -- ? ) GML: currentdict ( -- dict ) dup current-dict ; GML: load ( name -- value ) over lookup-name ; -ERROR: not-a-name obj ; +ERROR: not-a-name object ; : check-name ( obj -- obj' ) dup name? [ not-a-name ] unless ; inline