summaryrefslogtreecommitdiff
path: root/dmake
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-10-15 14:40:45 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-10-15 14:40:45 +0000
commit12dbccf2adcf18152c4aada0f44362f54a527265 (patch)
tree7127570f8684bae534cba63c91c5458e70383e81 /dmake
parentd0ecd9768c8b4729f33efc48f13c36d666cc4b0e (diff)
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.
Diffstat (limited to 'dmake')
-rw-r--r--dmake/parse.c14
1 files changed, 8 insertions, 6 deletions
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;