Changeset 320f1c in git

Timestamp:

Aug 11, 2011, 3:24:36 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

cc730207d12dc34abc9c79393ad0bbe159c3ff88

Parents:

4ff07fdd3051ba7acda256542ea021e65250925d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-11 15:24:36+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:19:15+01:00

Message:

fix ssiLink.cc

Location:

Singular

Files:

• ipshell.h (modified) (1 diff)
• ssiLink.cc (modified) (8 diffs)

Singular/ipshell.h

@@ -98 +98 @@
 syStrategy syConvList(lists li,BOOLEAN toDel);
 
-void rSetHdl(idhdl h);
-
-
 /* ================================================================== */
 /* Expressions : */

Singular/ssiLink.cc

@@ -27 +27 @@
 
 #include <Singular/tok.h>
+#include <Singular/ipshell.h>
 #include <Singular/ipid.h>
 #include <omalloc/omalloc.h>
@@ -203 +204 @@
   d->r->ref++;
   SSI_BLOCK_CHLD;
-  fprintf(d->f_write,"%d %d ",r->ch,r->N);
+  fprintf(d->f_write,"%d %d ",n_GetChar(r->cf),r->N);
 
   int i;
@@ -347 +348 @@
    case 3:
      {// read int or mpz_t or mpz_t, mpz_t
-       number n=nlRInit(0);
+       number n=(number)omAlloc0(sizeof(snumber_dummy));
        SSI_BLOCK_CHLD;
        mpz_inp_str(((number_dummy)n)->z,d->f_read,0);
@@ -360 +361 @@
        fscanf(d->f_read,"%d",&dd);
        SSI_UNBLOCK_CHLD;
-       return INT_TO_SR(dd);
+       return n_Init(dd,d->r->cf);
      }
    default:
@@ -381 +382 @@
      case 1:
        {// read mpz_t, mpz_t
-         number n=nlRInit(0);
+         number n=(number)omAlloc0(sizeof(snumber_dummy));
          mpz_init(((number_dummy)n)->n);
          SSI_BLOCK_CHLD;
@@ -392 +393 @@
      case 3:
        {// read mpz_t
-         number n=nlRInit(0);
+         number n=(number)omAlloc0(sizeof(snumber_dummy));
          SSI_BLOCK_CHLD;
          gmp_fscanf(d->f_read,"%Zd",((number_dummy)n)->z);
@@ -405 +406 @@
          fscanf(d->f_read,"%d",&dd);
          SSI_UNBLOCK_CHLD;
-         return INT_TO_SR(dd);
+         return n_Init(dd,d->r->cf);
        }
      case 5:
      case 6:
        {// read raw mpz_t, mpz_t
-         number n=nlRInit(0);
+         number n=(number)omAlloc0(sizeof(snumber_dummy));
          mpz_init(((number_dummy)n)->n);
          SSI_BLOCK_CHLD;
@@ -421 +422 @@
      case 8:
        {// read raw mpz_t
-         number n=nlRInit(0);
+         number n=(number)omAlloc0(sizeof(snumber_dummy));
          SSI_BLOCK_CHLD;
          mpz_inp_str (((number_dummy)n)->z, d->f_read, 32);