/* * Copyright 1993, 1995 Christopher Seiwald. * * This file is part of Jam - see jam.c for Copyright information. */ # include "jam.h" # include "lists.h" # include "variable.h" # include "expand.h" # include "filesys.h" # include "newstr.h" /* * expand.c - expand a buffer, given variable values * * External routines: * * var_expand() - variable-expand input string into list of strings * * Internal routines: * * var_edit() - copy input target name to output, performing : modifiers * var_mods() - parse : modifiers into FILENAME structure * * 01/25/94 (seiwald) - $(X)$(UNDEF) was expanding like plain $(X) * 04/13/94 (seiwald) - added shorthand L0 for null list pointer */ static void var_edit(); static void var_mods(); # define MAGIC_COLON '\001' # define MAGIC_LEFT '\002' # define MAGIC_RIGHT '\003' /* * var_expand() - variable-expand input string into list of strings * * Would just copy input to output, performing variable expansion, * except that since variables can contain multiple values the result * of variable expansion may contain multiple values (a list). Properly * performs "product" operations that occur in "$(var1)xxx$(var2)" or * even "$($(var2))". * * Returns a newly created list. */ LIST * var_expand( l, in, end, lol, cancopyin ) LIST *l; char *in; char *end; LOL *lol; int cancopyin; { char out_buf[ MAXSYM ]; char *out = out_buf; char *inp = in; char *ov; /* for temp copy of variable in outbuf */ int depth; if( DEBUG_VAREXP ) printf( "expand '%.*s'\n", end - in, in ); /* This gets alot of cases: $(<) and $(>) */ if( in[0] == '$' && in[1] == '(' && in[3] == ')' && !in[4] ) { switch( in[2] ) { case '1': case '<': return list_copy( l, lol_get( lol, 0 ) ); case '2': case '>': return list_copy( l, lol_get( lol, 1 ) ); } } /* Just try simple copy of in to out. */ while( in < end ) if( ( *out++ = *in++ ) == '$' && *in == '(' ) goto expand; /* No variables expanded - just add copy of input string to list. */ /* Cancopyin is an optimization: if the input was already a list */ /* item, we can use the copystr() to put it on the new list. */ /* Otherwise, we use the slower newstr(). */ *out = '\0'; if( cancopyin ) return list_new( l, copystr( inp ) ); else return list_new( l, newstr( out_buf ) ); expand: /* * Input so far (ignore blanks): * * stuff-in-outbuf $(variable) remainder * ^ ^ * in end * Output so far: * * stuff-in-outbuf $ * ^ ^ * out_buf out * * * We just copied the $ of $(...), so back up one on the output. * We now find the matching close paren, copying the variable and * modifiers between the $( and ) temporarily into out_buf, so that * we can replace :'s with MAGIC_COLON. This is necessary to avoid * being confused by modifier values that are variables containing * :'s. Ugly. */ depth = 1; out--, in++; ov = out; while( in < end && depth ) { switch( *ov++ = *in++ ) { case '(': depth++; break; case ')': depth--; break; case ':': ov[-1] = MAGIC_COLON; break; case '[': ov[-1] = MAGIC_LEFT; break; case ']': ov[-1] = MAGIC_RIGHT; break; } } /* Copied ) - back up. */ ov--; /* * Input so far (ignore blanks): * * stuff-in-outbuf $(variable) remainder * ^ ^ * in end * Output so far: * * stuff-in-outbuf variable * ^ ^ ^ * out_buf out ov * * Later we will overwrite 'variable' in out_buf, but we'll be * done with it by then. 'variable' may be a multi-element list, * so may each value for '$(variable element)', and so may 'remainder'. * Thus we produce a product of three lists. */ { LIST *variables = 0; LIST *remainder = 0; LIST *vars; /* Recursively expand variable name & rest of input */ if( out < ov ) variables = var_expand( L0, out, ov, lol, 0 ); if( in < end ) remainder = var_expand( L0, in, end, lol, 0 ); /* Now produce the result chain */ /* For each variable name */ for( vars = variables; vars; vars = list_next( vars ) ) { LIST *value; char *colon; char *bracket; char varname[ MAXSYM ]; int i, sub1, sub2; /* Look for a : modifier in the variable name */ /* Must copy into varname so we can modify it */ strcpy( varname, vars->string ); if( colon = strchr( varname, MAGIC_COLON ) ) *colon = '\0'; if( bracket = strchr( varname, MAGIC_LEFT ) ) { char *dash; if( dash = strchr( bracket + 1, '-' ) ) { *dash = '\0'; sub1 = atoi( bracket + 1 ); sub2 = atoi( dash + 1 ); } else { sub1 = sub2 = atoi( bracket + 1 ); } *bracket = '\0'; } else { sub1 = sub2 = 0; /* not needed */ } /* Get variable value, specially handling $(<), $(>), $(n) */ if( varname[0] == '<' && !varname[1] ) { value = lol_get( lol, 0 ); } else if( varname[0] == '>' && !varname[1] ) { value = lol_get( lol, 1 ); } else if( varname[0] >= '1' && varname[0] <= '9' && !varname[1] ) { value = lol_get( lol, varname[0] - '1' ); } else { value = var_get( varname ); } /* The fast path: $(x) - just copy the variable value. */ if( out == out_buf && !bracket && !colon && in == end ) { l = list_copy( l, value ); continue; } /* For each variable value */ for( i = 1; value; i++, value = list_next( value ) ) { LIST *rem; char *out1; /* Skip members not in subscript */ if( bracket && ( i < sub1 || sub2 && i > sub2 ) ) continue; /* Apply : mods, if present */ if( colon ) var_edit( value->string, colon + 1, out ); else strcpy( out, value->string ); /* If no remainder, append result to output chain. */ if( in == end ) { l = list_new( l, newstr( out_buf ) ); continue; } /* Remember the end of the variable expansion so */ /* we can just tack on each instance of 'remainder' */ out1 = out + strlen( out ); /* For each remainder, or just once if no remainder, */ /* append the complete string to the output chain */ for( rem = remainder; rem; rem = list_next( rem ) ) { strcpy( out1, rem->string ); l = list_new( l, newstr( out_buf ) ); } } } /* variables & remainder were gifts from var_expand */ /* and must be freed */ if( variables ) list_free( variables ); if( remainder) list_free( remainder ); if( DEBUG_VAREXP ) { printf( "expanded to " ); list_print( l ); printf( "\n" ); } return l; } } /* * var_edit() - copy input target name to output, performing : modifiers */ typedef struct { char downshift; /* :L -- downshift result */ char upshift; /* :U -- upshift result */ char parent; /* :P -- go to parent directory */ #ifdef OPT_SLASH_MODIFIERS_EXT char fslash; /* :/ -- convert all \ to / */ char bslash; /* :\ -- convert all / to \ */ #endif } VAR_ACTS ; static void var_edit( in, mods, out ) char *in; char *mods; char *out; { FILENAME old, new; VAR_ACTS acts; /* Parse apart original filename, putting parts into "old" */ file_parse( in, &old ); /* Parse apart modifiers, putting them into "new" */ var_mods( mods, &new, &acts ); /* Replace any old with new */ if( new.f_grist.ptr ) old.f_grist = new.f_grist; if( new.f_root.ptr ) old.f_root = new.f_root; if( new.f_dir.ptr ) old.f_dir = new.f_dir; if( new.f_base.ptr ) old.f_base = new.f_base; if( new.f_suffix.ptr ) old.f_suffix = new.f_suffix; if( new.f_member.ptr ) old.f_member = new.f_member; /* If requested, modify old to point to parent */ if( acts.parent ) file_parent( &old ); /* Put filename back together */ file_build( &old, out, 0 ); #ifdef OPT_SLASH_MODIFIERS_EXT if( acts.fslash ) { char *ptr = out; for( ; *out; ++out ) if (*out == '\\') *out = '/'; out = ptr; } else if( acts.bslash ) { char *ptr = out; for( ; *out; ++out ) if (*out == '/') *out = '\\'; out = ptr; } #endif /* Handle upshifting, downshifting now */ if( acts.upshift ) { for( ; *out; ++out ) *out = toupper( *out ); } else if( acts.downshift ) { for( ; *out; ++out ) *out = tolower( *out ); } } /* * var_mods() - parse : modifiers into FILENAME structure * * The : modifiers in a $(varname:modifier) currently support replacing * or omitting elements of a filename, and so they are parsed into a * FILENAME structure (which contains pointers into the original string). * * Modifiers of the form "X=value" replace the component X with * the given value. Modifiers without the "=value" cause everything * but the component X to be omitted. X is one of: * * G <grist> * D directory name * B base name * S .suffix * M (member) * R root directory - prepended to whole path * * This routine sets: * * f->f_xxx.ptr = 0 * f->f_xxx.len = 0 * -> leave the original component xxx * * f->f_xxx.ptr = string * f->f_xxx.len = strlen( string ) * -> replace component xxx with string * * f->f_xxx.ptr = "" * f->f_xxx.len = 0 * -> omit component xxx * * var_edit() above and file_build() obligingly follow this convention. */ static void var_mods( mods, f, acts ) char *mods; FILENAME *f; VAR_ACTS *acts; { char *flags = "GRDBSM"; int havezeroed = 0; memset( (char *)f, 0, sizeof( *f ) ); memset( (char *)acts, 0, sizeof( *acts ) ); while( *mods ) { char *fl; struct filepart *fp; /* First take care of :U or :L (upshift, downshift) */ if( *mods == 'L' ) { acts->downshift = 1; ++mods; continue; } else if( *mods == 'U' ) { acts->upshift = 1; ++mods; continue; } else if( *mods == 'P' ) { acts->parent = 1; ++mods; continue; } #ifdef OPT_SLASH_MODIFIERS_EXT else if( *mods == '/' ) { acts->fslash = 1; ++mods; continue; } else if( *mods == '\\' ) { acts->bslash = 1; ++mods; continue; } #endif /* Now handle the file component flags */ if( !( fl = strchr( flags, *mods++ ) ) ) break; /* should complain, but so what... */ fp = &f->part[ fl - flags ]; if( *mods++ != '=' ) { /* :X - turn everything but X off */ int i; mods--; if( !havezeroed++ ) for( i = 0; i < 6; i++ ) { f->part[ i ].len = 0; f->part[ i ].ptr = ""; } fp->ptr = 0; } else { /* :X=value - set X to value */ char *p; if( p = strchr( mods, MAGIC_COLON ) ) { fp->ptr = mods; fp->len = p - mods; mods = p + 1; } else { fp->ptr = mods; fp->len = strlen( mods ); mods += fp->len; } } } }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#5 | 3183 | Craig Mcpheeters | Integration of my jam mainline branch into my work branch. | ||
#4 | 1477 | Craig Mcpheeters |
Integration from my main jam branch. This is 2.4-dev with my extensions. |
||
#3 | 785 | Craig Mcpheeters |
Integration from //guest/craig_mcpheeters/jam/src/... This work area now contains both the Alias|Wavefront changes, and the latest integrations from the mainline. There are some changes in this area which shouldn't be merged back into the mainline. As I merge this branch back into my jam/src/... branch, I'll leave out a few of the changes. |
||
#2 | 782 | Craig Mcpheeters |
Initial return of the Alias|Wavefront mods to jam 2.2. I made a stab at a configuration system - see the file Jamfile.config. Most of the mods are now enclosed within #ifdef blocks, which kind of pollutes the code, but may make it easier to accept or reject some of these changes. Some of these #ifdefs could disappear completely if they are accepted into the mainline This return implements the following extensions: * header cache * dynamic command block size, allowing for *large* commands * slightly improved warnings and errors * serial output from jam - nice when working with multiple jobs * an extension to variable modifiers: $(>:/) and $(>:\\) * ability to ignore header dependencies for a build (jam -p) * new debug level, -d+10, which outputs the dependency graph * added no-care support to internal nodes. if they fail, dependents are built anyway * time stamps on output * a few minor output modifications * a fix for nt batch file names conflicing when more than one jam runs at a time Each of the above can be enabled/disabled on the command line. For example, to turn on the HeaderCache code: jam -sHeaderCache=1 that is, build jam first, then use that jam to build a new one with the options you want. Some of these changes may have been made in the mainline already, my next step will be to integrate the mainline changes into these ones This return isn't yet ready for prime-time |
||
#1 | 777 | Craig Mcpheeters |
Branch of my jam/src/... area. This new area establishes the integration base for the copy of Jam which has all the changes. |
||
//guest/craig_mcpheeters/jam/src/expand.c | |||||
#2 | 617 | Craig Mcpheeters | Integration from mainline as of @3 | ||
#1 | 616 | Craig Mcpheeters | Integration from Jam mainline, as of @2 |