From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26536 invoked by alias); 1 Nov 2009 21:11:48 -0000 Received: (qmail 26528 invoked by uid 22791); 1 Nov 2009 21:11:47 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_00,DNS_FROM_RFC_BOGUSMX X-Spam-Check-By: sourceware.org Received: from sebabeach.org (HELO sebabeach.org) (64.165.110.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 01 Nov 2009 21:11:44 +0000 Received: by sebabeach.org (Postfix, from userid 500) id 070FA6E3D5; Sun, 1 Nov 2009 13:11:42 -0800 (PST) From: Doug Evans To: cgen@sourceware.org Subject: [commit] better error message for misspelled rtx function name Message-Id: <20091101211143.070FA6E3D5@sebabeach.org> Date: Sun, 01 Nov 2009 21:11:00 -0000 X-IsSubscribed: yes Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org X-SW-Source: 2009-q4/txt/msg00032.txt.bz2 Hi. This patch improves the error messages for accidentally mistyped rtl expressions like (add ((const) 1) 2). [Note the parens around `const'.] Most of the patch is just due to indentation changes. 2009-11-01 Doug Evans * rtl-traverse.scm (/rtx-canon): Issue better error message for invalid rtx function names. Index: rtl-traverse.scm =================================================================== RCS file: /cvs/src/src/cgen/rtl-traverse.scm,v retrieving revision 1.15 retrieving revision 1.17 diff -u -p -r1.15 -r1.17 --- rtl-traverse.scm 25 Sep 2009 19:40:08 -0000 1.15 +++ rtl-traverse.scm 1 Nov 2009 21:09:57 -0000 1.17 @@ -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))))) + (let ((rtx-name (car expr))) + (if (not (symbol? rtx-name)) + (/rtx-canon-error cstate "invalid rtx function name" + expr parent-expr op-num)) + (let ((rtx-obj (rtx-lookup rtx-name))) + (if rtx-obj + (/rtx-canon-expr rtx-obj mode rtx-name (cdr expr) + parent-expr op-num cstate env depth) + (let ((rtx-obj (/rtx-macro-lookup rtx-name))) + (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.