Changeset 538512 in git
- Timestamp:
- Jan 10, 2013, 12:47:19 PM (11 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')
- Children:
- 80c703d0b975055386088b85c7bcdd5c7684adc0
- Parents:
- c2ff4132e497bb884e85e7bcb9974f183308e2bb
- git-author:
- Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-01-10 12:47:19+01:00
- git-committer:
- Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-01-10 12:48:14+01:00
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/extra.cc
rc2ff413 r538512 421 421 { 422 422 res->rtyp=STRING_CMD; 423 res->data=(void *) omStrDup(versionString());423 res->data=(void *)versionString(); 424 424 return FALSE; 425 425 } … … 473 473 { 474 474 res->rtyp = STRING_CMD; 475 char* b =StringSetS("");475 StringSetS(""); 476 476 feStringAppendBrowsers(0); 477 res->data = omStrDup(b);477 res->data = StringEndS(); 478 478 return FALSE; 479 479 } -
Singular/feOpt.cc
rc2ff413 r538512 241 241 242 242 case FE_OPT_VERSION: 243 printf("%s",versionString()); 244 return NULL; 243 { 244 char *s=versionString(); 245 printf("%s",s); 246 omFree(s); 247 return NULL; 248 } 245 249 246 250 case FE_OPT_ECHO: -
Singular/fehelp.cc
rc2ff413 r538512 144 144 #endif 145 145 146 char* matches =StringSetS("");146 StringSetS(""); 147 147 int found = heReKey2Entry(idxfile, str, &hentry); 148 148 … … 185 185 Warn("No help for topic '%s'", str); 186 186 Warn("Try one of"); 187 char *matches=StringEndS(); 187 188 PrintS(matches); 188 PrintS("\n"); 189 PrintLn(); 190 omFree(matches); 189 191 return; 190 192 } … … 846 848 //} 847 849 Warn("Use 'system(\"--browser\", <browser>);' to change browser,"); 848 char* browsers =StringSetS("where <browser> can be: ");850 StringSetS("where <browser> can be: "); 849 851 int i = 0; 850 852 i = 0; … … 855 857 i++; 856 858 } 859 char *browsers=StringEndS(); 857 860 if (browsers[strlen(browsers)-2] == ',') 858 861 { … … 861 864 } 862 865 WarnS(browsers); 866 omFree(browsers); 863 867 } 864 868 -
Singular/ipprint.cc
rc2ff413 r538512 79 79 i=MATCOLS(m)*MATROWS(m)-1; 80 80 ss=pString(m->m[i]); 81 if ((int)strlen(ss)>colmax) s[i]=NULL;82 else s[i]= omStrDup(ss);81 if ((int)strlen(ss)>colmax) { s[i]=NULL; omFree(ss); } 82 else s[i]=ss; 83 83 for(i--;i>=0;i--) 84 84 { 85 pString(m->m[i]); 86 ss=StringAppendS(","); 85 StringSetS(""); 86 pString0(m->m[i]); 87 StringAppendS(","); 88 ss=StringEndS(); 87 89 if ((int)strlen(ss)>colmax) s[i]=NULL; 88 else s[i]= omStrDup(ss);90 else s[i]=ss; 89 91 } 90 92 /* look up the width of all columns, put it in l[col_nr] */ -
Singular/links/silink.cc
rc2ff413 r538512 785 785 StringSetS(""); 786 786 p_Write(IDRING(h)->cf->extRing->qideal->m[0],IDRING(h)->cf->extRing); 787 rhs = StringAppendS(""); 788 if (fprintf(fd, "; minpoly = %s", rhs) == EOF) return EOF; 787 rhs = StringEndS(); 788 if (fprintf(fd, "; minpoly = %s", rhs) == EOF) { omFree(rhs); return EOF;} 789 omFree(rhs); 789 790 } 790 791 else if (type_id == INTVEC_CMD) fprintf(fd, ")"); -
Singular/misc_ip.cc
rc2ff413 r538512 721 721 } 722 722 } 723 return omStrDup(StringAppendS("")); 724 } 725 return omStrDup(StringAppendS(" none")); 723 return StringEndS(); 724 } 725 StringAppendS(" none"); 726 return StringEndS(); 726 727 } 727 728 728 729 char * versionString() 729 730 { 730 char* str =StringSetS("");731 StringSetS(""); 731 732 StringAppend("Singular for %s version %s (%d-%s) %s\nwith\n", 732 733 S_UNAME, S_VERSION1, SINGULAR_VERSION, … … 842 843 feStringAppendBrowsers(0); 843 844 StringAppendS("\n"); 844 return str;845 return StringEndS(); 845 846 } 846 847 -
Singular/newstruct.cc
rc2ff413 r538512 87 87 { 88 88 StringAppendS(a->name); 89 char *tmp=omStrDup(StringAppendS("="));89 StringAppendS("="); 90 90 if ((!RingDependend(a->typ)) 91 91 || ((l->m[a->pos-1].data==(void *)currRing) … … 98 98 else 99 99 { 100 StringSetS("");101 100 char *tmp2=omStrDup(l->m[a->pos].String()); 102 StringSetS(tmp);103 101 if ((strlen(tmp2)>80)||(strchr(tmp2,'\n')!=NULL)) 104 102 { … … 110 108 } 111 109 else StringAppendS("??"); 112 omFree(tmp);113 110 if (a->next==NULL) break; 114 111 StringAppendS("\n"); … … 116 113 a=a->next; 117 114 } 118 return omStrDup(StringAppendS(""));115 return StringEndS(); 119 116 } 120 117 } -
Singular/subexpr.cc
rc2ff413 r538512 767 767 nDelete(&n); 768 768 } 769 s =StringAppendS((char*) (typed ? ")" : ""));770 return omStrDup(s);769 StringAppendS((char*) (typed ? ")" : "")); 770 return StringEndS(); 771 771 772 772 case BIGINT_CMD: … … 775 775 number nl=(number)d; 776 776 n_Write(nl,coeffs_BIGINT); 777 s =StringAppendS((char*) (typed ? ")" : ""));778 return omStrDup(s);777 StringAppendS((char*) (typed ? ")" : "")); 778 return StringEndS(); 779 779 } 780 780 -
dyn_modules/bigintm/bigintm.cc
rc2ff413 r538512 36 36 StringSetS(""); 37 37 number n=(number)d; n_Write(n, coeffs_BIGINT); d=(void*)n; 38 return omStrDup(StringAppendS(""));38 return StringEndS(); 39 39 } 40 40 } -
kernel/polys.h
rc2ff413 r538512 273 273 // let's inline those, so that we can call them from the debugger 274 274 inline char* pString(poly p) {return p_String(p, currRing, currRing);} 275 inline char* pString0(poly p) {returnp_String0(p, currRing, currRing);}275 inline void pString0(poly p) {p_String0(p, currRing, currRing);} 276 276 inline void pWrite(poly p) {p_Write(p, currRing, currRing);} 277 277 inline void pWrite0(poly p) {p_Write0(p, currRing, currRing);} -
kernel/tgbgauss.cc
rc2ff413 r538512 507 507 StringSetS(""); 508 508 n_Write(n[i][j],currRing); 509 PrintS(StringAppendS(""));509 char *s=StringEndS(); PrintS(s); omFree(s); 510 510 PrintS("\t"); 511 511 } … … 706 706 number n=get(i,j); 707 707 n_Write(n,currRing); 708 PrintS(StringAppendS(""));708 char *s=StringEndS(); PrintS(s); omFree(s); 709 709 PrintS("\t"); 710 710 } -
libpolys/coeffs/bigintmat.cc
rc2ff413 r538512 371 371 StringAppendS("\n"); 372 372 } */ 373 return String AppendS("");373 return StringEndS(); 374 374 } 375 375 … … 438 438 StringSetS(""); 439 439 n_Write(v[col*i+j], basecoeffs()); 440 char * tmp = String AppendS("");440 char * tmp = StringEndS(); 441 441 const int _nl = strlen(tmp); 442 442 wv[col*i+j] = _nl; 443 443 if (_nl > cwv[j]) 444 444 cwv[j]=_nl; 445 omFree(tmp); 445 446 } 446 447 } … … 479 480 StringSetS(""); 480 481 n_Write(v[i], basecoeffs()); 481 char * temp = StringAppendS(""); 482 char * ts = omStrDup(temp); 482 char * ts = StringEndS(); 483 483 const int _nl = strlen(ts); 484 484 int cj = i%col; … … 488 488 int ci = floor(i/col); 489 489 StringAppend("[%d,%d]", ci+1, cj+1); 490 char *tmp = StringAppendS(""); 491 char * ph = omStrDup(tmp); 490 char * ph = StringEndS(); 492 491 int phl = strlen(ph); 493 492 if (phl > colwid[cj]) -
libpolys/coeffs/ffields.cc
rc2ff413 r538512 970 970 StringSetS("// minpoly : "); 971 971 nfShowMipo(r); 972 PrintS(StringAppendS("\n")); 972 StringAppendS("\n"); 973 char *s=StringEndS(); PrintS(s); omFree(s); 973 974 } 974 975 else PrintS("// minpoly : ...\n"); -
libpolys/misc/int64vec.cc
rc2ff413 r538512 89 89 } 90 90 } 91 return String AppendS("");91 return StringEndS(); 92 92 } 93 93 -
libpolys/misc/intvec.cc
rc2ff413 r538512 114 114 } 115 115 } 116 return String AppendS("");116 return StringEndS(); 117 117 } 118 118 -
libpolys/polys/clapsing.cc
rc2ff413 r538512 1372 1372 } 1373 1373 } 1374 char * s= omStrDup(StringAppendS(""));1374 char * s=StringEndS(); 1375 1375 if (s[strlen(s)-1]==',') s[strlen(s)-1]='\0'; 1376 1376 return s; -
libpolys/polys/matpol.cc
rc2ff413 r538512 777 777 int j,jj = MATCOLS(im); 778 778 poly *pp = im->m; 779 char *s=StringSetS("");779 StringSetS(""); 780 780 781 781 for (i=0; i<ii; i++) … … 784 784 { 785 785 p_String0(*pp++, r); 786 s=StringAppend("%c",ch); 787 if (dim > 1) s = StringAppendS("\n"); 788 } 789 } 786 StringAppend("%c",ch); 787 if (dim > 1) StringAppendS("\n"); 788 } 789 } 790 char *s=StringEndS(); 790 791 s[strlen(s)- (dim > 1 ? 2 : 1)]='\0'; 791 792 return s; -
libpolys/polys/monomials/p_polys.h
rc2ff413 r538512 338 338 ***************************************************************/ 339 339 /// print p according to ShortOut in lmRing & tailRing 340 char*p_String0(poly p, ring lmRing, ring tailRing);340 void p_String0(poly p, ring lmRing, ring tailRing); 341 341 char* p_String(poly p, ring lmRing, ring tailRing); 342 342 void p_Write(poly p, ring lmRing, ring tailRing); … … 345 345 346 346 /// print p in a short way, if possible 347 char*p_String0Short(const poly p, ring lmRing, ring tailRing);347 void p_String0Short(const poly p, ring lmRing, ring tailRing); 348 348 349 349 /// print p in a long way 350 char*p_String0Long(const poly p, ring lmRing, ring tailRing);350 void p_String0Long(const poly p, ring lmRing, ring tailRing); 351 351 352 352 … … 1154 1154 return p_String(p, p_ring, p_ring); 1155 1155 } 1156 static inline char*p_String0(poly p, ring p_ring)1157 { 1158 returnp_String0(p, p_ring, p_ring);1156 static inline void p_String0(poly p, ring p_ring) 1157 { 1158 p_String0(p, p_ring, p_ring); 1159 1159 } 1160 1160 static inline void p_Write(poly p, ring p_ring) -
libpolys/polys/monomials/ring.cc
rc2ff413 r538512 589 589 } 590 590 591 if (l==nblocks) return omStrDup(StringAppendS(""));591 if (l==nblocks) return StringEndS(); 592 592 StringAppendS(","); 593 593 } -
libpolys/polys/polys0.cc
rc2ff413 r538512 96 96 97 97 /// if possible print p in a short way... 98 char*p_String0Short(const poly p, ring lmRing, ring tailRing)98 void p_String0Short(const poly p, ring lmRing, ring tailRing) 99 99 { 100 100 // NOTE: the following (non-thread-safe!) UGLYNESS … … 108 108 tailRing->ShortOut = rCanShortOut(tailRing); 109 109 110 char* res =p_String0(p, lmRing, tailRing);110 p_String0(p, lmRing, tailRing); 111 111 112 112 lmRing->ShortOut = bLMShortOut; 113 113 tailRing->ShortOut = bTAILShortOut; 114 115 return res;116 114 } 117 115 118 116 /// print p in a long way... 119 char*p_String0Long(const poly p, ring lmRing, ring tailRing)117 void p_String0Long(const poly p, ring lmRing, ring tailRing) 120 118 { 121 119 // NOTE: the following (non-thread-safe!) UGLYNESS … … 129 127 tailRing->ShortOut = FALSE; 130 128 131 char* res =p_String0(p, lmRing, tailRing);129 p_String0(p, lmRing, tailRing); 132 130 133 131 lmRing->ShortOut = bLMShortOut; 134 132 tailRing->ShortOut = bTAILShortOut; 135 136 return res; 137 } 138 139 140 char* p_String0(poly p, ring lmRing, ring tailRing) 133 } 134 135 136 void p_String0(poly p, ring lmRing, ring tailRing) 141 137 { 142 138 if (p == NULL) 143 139 { 144 return StringAppendS("0"); 140 StringAppendS("0"); 141 return; 145 142 } 146 143 if ((p_GetComp(p, lmRing) == 0) || (!lmRing->VectorOut)) … … 156 153 p = pNext(p); 157 154 } 158 return StringAppendS("");155 return; 159 156 } 160 157 … … 180 177 k++; 181 178 } 182 returnStringAppendS("]");179 StringAppendS("]"); 183 180 } 184 181 … … 186 183 { 187 184 StringSetS(""); 188 return p_String0(p, lmRing, tailRing); 185 p_String0(p, lmRing, tailRing); 186 return StringEndS(); 189 187 } 190 188 -
libpolys/reporter/reporter.cc
rc2ff413 r538512 35 35 // this is an upper limit for the size of monomials/numbers read via the interpreter 36 36 #define MAX_FILE_BUFFER 4*4096 37 static long feBufferLength=INITIAL_PRINT_BUFFER; 38 static char * feBuffer=(char *)omAlloc(INITIAL_PRINT_BUFFER); 37 static long feBufferLength=0; 38 static char * feBuffer=NULL; 39 static long feBufferLength_save[8]; 40 static char * feBuffer_save[8]; 41 static int feBuffer_cnt=0; 42 static char * feBufferStart_save[8]; 43 39 44 40 45 char * feErrors=NULL; … … 52 57 static char * feBufferStart; 53 58 /* only used in StringSet(S)/StringAppend(S)*/ 54 char *StringAppend(const char *fmt, ...)59 void StringAppend(const char *fmt, ...) 55 60 { 56 61 va_list ap; … … 96 101 omCheckAddrSize(feBuffer, feBufferLength); 97 102 va_end(ap); 98 return feBuffer; 99 } 100 101 char * StringAppendS(const char *st) 103 } 104 105 void StringAppendS(const char *st) 102 106 { 103 107 if (*st!='\0') … … 118 122 feBufferStart +=l; 119 123 } 120 return feBuffer; 121 } 122 123 char * StringSetS(const char *st) 124 { 124 } 125 126 void StringSetS(const char *st) 127 { 128 feBuffer_save[feBuffer_cnt]=feBuffer; 129 feBuffer=(char*)omAlloc0(INITIAL_PRINT_BUFFER); 130 feBufferLength_save[feBuffer_cnt]=feBufferLength; 131 feBufferLength=INITIAL_PRINT_BUFFER; 132 feBufferStart_save[feBuffer_cnt]=feBufferStart; 133 feBufferStart=feBuffer; 134 feBuffer_cnt++; 125 135 int l; 126 136 long more; … … 128 138 { 129 139 more = ((l + (4*1024-1))/(4*1024))*(4*1024); 130 feBuffer=(char *)omReallocSize(( void *)feBuffer,feBufferLength,140 feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength, 131 141 more); 132 142 feBufferLength=more; … … 134 144 strcpy(feBuffer,st); 135 145 feBufferStart=feBuffer+l; 136 return feBuffer; 146 } 147 148 char * StringEndS() 149 { 150 char *r=feBuffer; 151 feBuffer_cnt--; 152 feBuffer=feBuffer_save[feBuffer_cnt]; 153 feBufferLength=feBufferLength_save[feBuffer_cnt]; 154 feBufferStart=feBufferStart_save[feBuffer_cnt]; 155 if (strlen(r)<1024) 156 { 157 char *s=omStrDup(r); omFree(r); r=s; 158 } 159 return r; 137 160 } 138 161 -
libpolys/reporter/reporter.h
rc2ff413 r538512 57 57 /* the C++-part: */ 58 58 59 char * StringAppend(const char *fmt, ...); 60 char * StringAppendS(const char *s); 61 char * StringSetS(const char* s); 62 void Warn(const char *fmt, ...); 59 void StringAppend(const char *fmt, ...); 60 void StringAppendS(const char *s); 61 void StringSetS(const char* s); 62 char * StringEndS(); 63 void Warn(const char *fmt, ...); 63 64 64 65 const char * eati(const char *s, int *i);
Note: See TracChangeset
for help on using the changeset viewer.