* rtl-traverse.scm (/rtx-canon): Issue better error message for

	invalid rtx function names.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index f2f407a..fd5b18a 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-01  Doug Evans  <dje@sebabeach.org>
+
+       * rtl-traverse.scm (/rtx-canon): Issue better error message for
+       invalid rtx function names.
+
 2009-10-28  Doug Evans  <dje@sebabeach.org>
 
        * cos.scm (object-assign!): New function.

diff --git a/cgen/rtl-traverse.scm b/cgen/rtl-traverse.scm
index 958d4fb..f2741f1 100644 (file)
--- a/cgen/rtl-traverse.scm
+++ b/cgen/rtl-traverse.scm
@@ -1182,16 +1182,20 @@
   (let ((result
         (if (pair? expr) ;; pair? -> cheap non-null-list?
 
-            (let ((rtx-obj (rtx-lookup (car expr))))
-              (if rtx-obj
-                  (/rtx-canon-expr rtx-obj mode (car expr) (cdr expr)
-                                   parent-expr op-num cstate env depth)
-                  (let ((rtx-obj (/rtx-macro-lookup (car expr))))
-                    (if rtx-obj
-                        (/rtx-canon (/rtx-macro-expand expr rtx-evaluator)
-                                    expected mode parent-expr op-num cstate env (+ depth 1))
-                        (/rtx-canon-error cstate "unknown rtx function"
-                                          expr parent-expr op-num)))))
+            (begin
+              (if (not (symbol? (car expr)))
+                  (/rtx-canon-error cstate "invalid rtx function name"
+                                    expr parent-expr op-num))
+              (let ((rtx-obj (rtx-lookup (car expr))))
+                (if rtx-obj
+                    (/rtx-canon-expr rtx-obj mode (car expr) (cdr expr)
+                                     parent-expr op-num cstate env depth)
+                    (let ((rtx-obj (/rtx-macro-lookup (car expr))))
+                      (if rtx-obj
+                          (/rtx-canon (/rtx-macro-expand expr rtx-evaluator)
+                                      expected mode parent-expr op-num cstate env (+ depth 1))
+                          (/rtx-canon-error cstate "unknown rtx function"
+                                            expr parent-expr op-num))))))
 
             ;; EXPR is not a list.
             ;; See if it's an operand shortcut.