From 9de84b897608d46f756eb073d62f37b0f4b234ec Mon Sep 17 00:00:00 2001 From: ketmar Date: Wed, 2 Oct 2013 08:51:59 +0300 Subject: [PATCH] cosmetix in 'maxline' --- src/jam.h | 2 +- src/jamgram.yy | 2 +- src/make1.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jam.h b/src/jam.h index 8fd82d9..f1b1705 100644 --- a/src/jam.h +++ b/src/jam.h @@ -91,7 +91,7 @@ # define OSMINOR "OS=MINGW" # define OS_NT # define SPLITPATH ';' -# define MAXLINE 996 /* longest 'together' actions */ +# define MAXLINE 2046 /* longest 'together' actions */ # define PATH_DELIM '\\' # define DOWNSHIFT_PATHS #endif diff --git a/src/jamgram.yy b/src/jamgram.yy index 14e465b..7002796 100644 --- a/src/jamgram.yy +++ b/src/jamgram.yy @@ -232,7 +232,7 @@ eflag(RR) ::= `existing` . { RR.number = RULE_EXISTING; } eflag(RR) ::= `maxline` T_ARG(A) . { RR.number = atoi(A.string); if (RR.number < 1) RR.number = 1; else if (RR.number > 1024) RR.number = 1024; - RR.number *= RULE_MAXLINE; + RR.number = (RR.number<<8)|RULE_MAXLINE; } diff --git a/src/make1.c b/src/make1.c index 43a004c..43b0084 100644 --- a/src/make1.c +++ b/src/make1.c @@ -405,8 +405,8 @@ static CMD *make1cmds (ACTIONS *a0) { */ start = 0; chunk = length = list_length(ns); - maxline = rule->flags / RULE_MAXLINE; - maxline = maxline && maxline < MAXLINE ? maxline : MAXLINE; + maxline = (rule->flags&RULE_MAXLINE ? rule->flags>>8 : 0); + maxline = (maxline && maxline < MAXLINE ? maxline : MAXLINE); do { /* build cmd: cmd_new consumes its lists */ CMD *cmd = cmd_new(rule, -- 2.11.4.GIT