From 12dbccf2adcf18152c4aada0f44362f54a527265 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 15 Oct 2007 14:40:45 +0000 Subject: INTEGRATION: CWS dmake411 (1.7.6); FILE MERGED 2007/08/09 01:43:17 vq 1.7.6.1: #i67709# Improve parsing of group recipes. --- dmake/parse.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'dmake') diff --git a/dmake/parse.c b/dmake/parse.c index 834a7bfc7f8d..2344192b8541 100644 --- a/dmake/parse.c +++ b/dmake/parse.c @@ -1,6 +1,6 @@ /* $RCSfile: parse.c,v $ --- $Revision: 1.7 $ --- last change: $Author: vg $ $Date: 2007-01-18 09:31:46 $ +-- $Revision: 1.8 $ +-- last change: $Author: ihi $ $Date: 2007-10-15 15:40:45 $ -- -- SYNOPSIS -- Parse the input, and perform semantic analysis @@ -84,10 +84,12 @@ FILE *fil; p = DmStrSpn( Buffer, " \t\r\n" ); if( Set_group_attributes( p ) ) { - if( rule && Group ) - Fatal( "Cannot mix single and group recipe lines" ); - else - Group = TRUE; + if( Group ) + Fatal( "New group recipe begin found within group recipe." ); + else if( rule ) + Fatal( "Cannot mix single and group recipe lines." ); + else + Group = TRUE; rule = TRUE; -- cgit