diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-05-24 08:21:17 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-05-24 08:21:17 +0000 |
| commit | b244fd5723c6c7951c36a89744240f04eec8c795 (patch) | |
| tree | f547c5d880d378fbc56463f7ac23b750fc2a4345 | |
| parent | 914063b53f350130e3fff005e8dba054eb8cca7c (diff) | |
| download | open-axiom-b244fd5723c6c7951c36a89744240f04eec8c795.tar.gz | |
* interp/define.boot (compDefineFunctor1): Robustify.
* hyper/parse-types.c (htperror): Fix thinko.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/hyper/parse-types.c | 4 | ||||
| -rw-r--r-- | src/interp/define.boot | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8eaaee6c..f830da0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-05-24 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/define.boot (compDefineFunctor1): Robustify. + * hyper/parse-types.c (htperror): Fix thinko. + 2008-05-23 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/c-util.boot (stackAndThrow): Take an optional parameter. diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c index 68382d83..986df978 100644 --- a/src/hyper/parse-types.c +++ b/src/hyper/parse-types.c @@ -69,7 +69,7 @@ static char *errmess[] = { /* * htperror(): arguments: msg - like perror it accepts an error - * message to be printed errno - the errno which occurred. This is so an + * message to be printed erno - the erno which occurred. This is so an * appropriate error message can be printed. * * The prints out the page name, and then the filename in which the error @@ -84,7 +84,7 @@ htperror(char *msg, int erno) /* The first thing I do is create the error message */ if (erno <= Numerrors) { - sprintf(obuff, "%s:%s\n", msg, errmess[errno]); + sprintf(obuff, "%s:%s\n", msg, errmess[erno]); } else { sprintf(obuff, "%s:\n", msg); diff --git a/src/interp/define.boot b/src/interp/define.boot index 5a2cb24e..959f313e 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -442,12 +442,10 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], target:= first signature' $functorTarget:= target $e:= giveFormalParametersValues(argl,$e) - [ds,.,$e]:= compMakeCategoryObject(target,$e) or ---+ copy needed since slot1 is reset; compMake.. can return a cached vector - sayBrightly '" cannot produce category object:" - pp target - return nil + [ds,.,$e]:= compMakeCategoryObject(target,$e) or return + stackAndThrow('" cannot produce category object: %1pb",[target]) $domainShell:= COPY_-SEQ ds +--+ copy needed since slot1 is reset; compMake.. can return a cached vector $attributesName:local := INTERN STRCONC(PNAME $op,'";attributes") attributeList := disallowNilAttribute ds.2 --see below under "loadTimeAlist" --+ 7 lines for $NRT follow |