@@ -19,7 +19,7 @@ <folderInfo id="cdt.managedbuild.config.gnu.macosx.exe.debug.528122784." name="/" resourcePath=""> <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug.150165186" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.debug"> <targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug.635377900" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"/> -<builder arguments="" autoBuildTarget="all" buildPath="${workspace_loc:/_doris/Debug}" cleanBuildTarget="clean" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.811473899" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelizationNumber="1" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/> +<builder arguments="" autoBuildTarget="all" buildPath="${workspace_loc:/_doris/Debug}" cleanBuildTarget="clean" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.811473899" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelizationNumber="1" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/> <tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.1013316680" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug"> <inputType id="cdt.managedbuild.tool.macosx.c.linker.input.124086079" superClass="cdt.managedbuild.tool.macosx.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> @@ -43,13 +43,15 @@ </toolChain> </folderInfo> <sourceEntries> -<entry excluding="src/core/old" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +<entry excluding="src/core/old|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> + +<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> <storageModule moduleId="scannerConfiguration"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> @@ -216,7 +218,6 @@ </profile> </scannerConfigBuildInfo> </storageModule> -<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> </cconfiguration> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> .cproject @@ -228,8 +228,9 @@ typedef long int FACT_ID; #define PRINT_KEYWORD "out" #define RAND_KEYWORD "rand" #define SEED_KEYWORD "seed" -#define LIST_LIT_START_KEYWORD "[" -#define LIST_LIT_END_KEYWORD "]" +#define LIST_LIT_START_KEYWORD "[" +#define LIST_LIT_END_KEYWORD "]" +#define VARIABLE_SIGIL '`' /** * This is a temporary hack to get around the problem where the src/core/constant.h @@ -295,7 +295,7 @@ globle EXPR_T *ix_parse_proc_args(void *env, char *src, struct token_t *tokens, get_token(env, src, tokens); - while((tokens->type == SF_VARIABLE) || (tokens->type == MF_VARIABLE)) + while(tokens->type == SYMBOL)//(tokens->type == SF_VARIABLE) || (tokens->type == MF_VARIABLE)) { for( check = args ; check != NULL ; check = check->rest_args ) { @@ -308,6 +308,20 @@ globle EXPR_T *ix_parse_proc_args(void *env, char *src, struct token_t *tokens, } } + /** + * In the functions parameters we want to check for the sequence + * implosion decl. If we find it, then the type of the symbol is + * changed to MF_VARIABLE. + **/ + if(has_decl(tokens->value) && is_decl(tokens->value, SEQ_EXPAND_DECL)) + { + tokens->type = MF_VARIABLE; + } + else + { + tokens->type = SF_VARIABLE; + } + if( *wildcard != NULL ) { ix_print_error_code(env, "PRCCODE", 8, FALSE); src/core/core_procedures.c @@ -167,21 +167,11 @@ globle void get_token(void *env, char *logical_name, struct token_t *tok) inchar = ix_rtr_getc(env, logical_name); } - if(inchar == '`') + if(inchar == VARIABLE_SIGIL) { - ix_rtr_ungetc(env, inchar, logical_name); tok->value = (void *)_scan_symbol(env, logical_name, 0, &type); tok->pp = to_str(tok->value); - - if(has_decl(tok->value) && is_decl(tok->value,SEQ_EXPAND_DECL)) - { - tok->type = MF_VARIABLE; - tok->value = intern_symbol(env, strtok(to_str(tok->value), DECL_MARKER)); - } - else - { - tok->type = SF_VARIABLE; - } + tok->type = SF_VARIABLE; } /* Process Symbolic Tokens. */ else if(isalpha(inchar) || is_UTF8_multibyte_start(inchar)) src/core/core_scanner.c @@ -364,7 +364,7 @@ globle void *intern_symbol(void *env, char *s) ix_rtr_exit(env, EXIT_FAILURE); } - tally = hash_symbol(s, SYMBOL_HASH_SZ); + tally = hash_symbol(str, SYMBOL_HASH_SZ); peek = get_atom_data(env)->symbol_table[tally]; /** @@ -401,7 +401,7 @@ globle void *intern_symbol(void *env, char *s) peek->bucket = tally; peek->count = 0; peek->permanent = FALSE; - sys_strcpy(peek->contents, s); + sys_strcpy(peek->contents, str); /* Store the declaration */ _attach_decl(env, decl, peek); src/core/type_atom.c 30060537fea568e5e88c6f1184883e40c2b64e30 Fogus mefogus@gmail.com http://github.com/fogus/ix/commit/0094a600a270346e50209d185cf2514f0e8d1438 0094a600a270346e50209d185cf2514f0e8d1438 2009-06-18T11:55:13-07:00 2009-06-18T11:55:13-07:00 function params need not be defined with the sigil. the sigil is intened to get at the value referred to by the symbol it qualifies ee7be8256e02a41e91c93e7874174c63706a00f5 Fogus mefogus@gmail.com