From 40ca3fc7f37c9cd091caac93d25781108ac5439e Mon Sep 17 00:00:00 2001
From: Jon Harper <jon.harper87@gmail.com>
Date: Sun, 28 Oct 2012 13:50:16 +0100
Subject: [PATCH] Friendlier grouping/clumping error message

---
 basis/debugger/debugger.factor | 4 +++-
 basis/grouping/grouping.factor | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index 154c7b7a40..d3d4b14a06 100755
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -10,7 +10,7 @@ classes compiler.units generic.standard generic.single vocabs
 init kernel.private io.encodings accessors math.order
 destructors source-files parser classes.tuple.parser
 effects.parser lexer generic.parser strings.parser vocabs.loader
-vocabs.parser source-files.errors ;
+vocabs.parser source-files.errors grouping ;
 IN: debugger
 
 GENERIC: error-help ( error -- topic )
@@ -220,6 +220,8 @@ M: slice-error summary
 
 M: bounds-error summary drop "Sequence index out of bounds" ;
 
+M: groups-error summary drop "Non positive group size" ;
+
 M: condition error. error>> error. ;
 
 M: condition summary error>> summary ;
diff --git a/basis/grouping/grouping.factor b/basis/grouping/grouping.factor
index 6cc5bb164a..83d48a14ad 100644
--- a/basis/grouping/grouping.factor
+++ b/basis/grouping/grouping.factor
@@ -4,6 +4,7 @@ USING: kernel math math.order strings arrays vectors sequences
 sequences.private accessors fry combinators ;
 IN: grouping
 
+ERROR: groups-error seq group-size ;
 <PRIVATE
 
 MIXIN: chunking
@@ -53,8 +54,8 @@ M: abstract-clumps group@
 
 TUPLE: chunking-seq { seq read-only } { n read-only } ;
 
-: check-groups ( n -- n )
-    dup 0 <= [ "Invalid group count" throw ] when ; inline
+: check-groups ( seq n -- seq n )
+    dup 0 <= [ groups-error ] when ; inline
 
 : new-groups ( seq n class -- groups )
     [ check-groups ] dip boa ; inline