Changeset 34fbd93 in git


Ignore:
Timestamp:
Jul 9, 1999, 4:58:30 PM (25 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
6959c49751ce060112fd62dace5b8f7590c72602
Parents:
609ba11e29d4d3c44b5785da0728121bbc8e0065
Message:
* hannes: ring r=(real,20,I),x,lp; <==> ring r=(real(20),I),x,lp;
          error message for CMD_M fixed (see coef("1","2");)
	  (grammar.y iparith.cc ipshell.h scanner.l subexpr.cc)


git-svn-id: file:///usr/local/Singular/svn/trunk@3255 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Singular/grammar.y

    r609ba11 r34fbd93  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: grammar.y,v 1.61 1999-05-29 12:00:01 Singular Exp $ */
     4/* $Id: grammar.y,v 1.62 1999-07-09 14:58:24 Singular Exp $ */
    55/*
    66* ABSTRACT: SINGULAR shell grammatik
     
    5858char       my_yylinebuf[80];
    5959char *     currid;
    60 BOOLEAN    noringvars=FALSE;
     60BOOLEAN    yyInRingConstruction=FALSE;
    6161BOOLEAN    expected_parms;
    6262int        cmdtok;
     
    364364            siq=0;
    365365            #endif
    366             noringvars = FALSE;
     366            yyInRingConstruction = FALSE;
    367367            currentVoice->ifsw=0;
    368368            if (inerror)
     
    941941        UNKNOWN_IDENT
    942942        {
    943 #if 0         
    944           if (!($$=rOrderName($1)))
    945             YYERROR;
    946 #else
    947943          // let rInit take care of any errors
    948944          $$=rOrderName($1);
    949 #endif         
    950945        }
    951946        ;
     
    13091304
    13101305ringcmd1:
    1311        RING_CMD { noringvars = TRUE; }
     1306       RING_CMD { yyInRingConstruction = TRUE; }
    13121307       ;
    13131308
     
    13431338            $6.CleanUp();
    13441339            $8.CleanUp();
    1345             noringvars = FALSE;
     1340            yyInRingConstruction = FALSE;
    13461341            if (b==NULL)
    13471342            {
     
    13711366            if(do_pop) namespaceroot->pop();
    13721367#endif /* HAVE_NAMESPACES */
    1373             noringvars = FALSE;
    1374           }
    1375         | DRING_CMD { noringvars = TRUE; }
     1368            yyInRingConstruction = FALSE;
     1369          }
     1370        | DRING_CMD { yyInRingConstruction = TRUE; }
    13761371          elemexpr cmdeq
    13771372          rlist     ','       /* description of coeffs */
     
    14121407            rDSet();
    14131408            #endif
    1414             noringvars = FALSE;
     1409            yyInRingConstruction = FALSE;
    14151410          }
    14161411        ;
  • Singular/iparith.cc

    r609ba11 r34fbd93  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.157 1999-07-09 14:06:45 obachman Exp $ */
     4/* $Id: iparith.cc,v 1.158 1999-07-09 14:58:25 Singular Exp $ */
    55
    66/*
     
    43114311  leftv v=u->next;
    43124312  u->next=NULL;
    4313   BOOLEAN b=iiExprArith2(res,u,iiOp,v);
     4313  BOOLEAN b=iiExprArith2(res,u,iiOp,v, (iiOp > 255));
    43144314  u->next=v;
    43154315  return b;
     
    45224522static BOOLEAN jjKLAMMER_PL(leftv res, leftv u)
    45234523{
     4524  if (yyInRingConstruction)
     4525  {
     4526    memcpy(res,u,sizeof(sleftv));
     4527    memset(u,0,sizeof(sleftv));
     4528    return FALSE;
     4529  }
    45244530  leftv v=u->next;
    45254531  BOOLEAN b;
  • Singular/ipshell.h

    r609ba11 r34fbd93  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: ipshell.h,v 1.17 1999-04-15 17:28:05 Singular Exp $ */
     6/* $Id: ipshell.h,v 1.18 1999-07-09 14:58:28 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    3232extern cmdnames cmds[];
    3333extern char *lastreserved;
     34extern BOOLEAN yyInRingConstruction; /* 1: during ring construction */
    3435
    3536int     IsCmd(char *n, int & tok);
  • Singular/scanner.l

    r609ba11 r34fbd93  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 /* $Id: scanner.l,v 1.17 1999-07-06 15:32:44 Singular Exp $ */
     5/* $Id: scanner.l,v 1.18 1999-07-09 14:58:29 Singular Exp $ */
    66#include <stdio.h>
    77#include <string.h>
     
    2323//extern unsigned char * yytext;
    2424extern int yyleng;
    25 extern BOOLEAN noringvars;
    2625extern int inerror;
    2726
  • Singular/subexpr.cc

    r609ba11 r34fbd93  
    55* ABSTRACT: handling of leftv
    66*/
    7 /* $Id: subexpr.cc,v 1.51 1999-06-15 11:36:41 Singular Exp $ */
     7/* $Id: subexpr.cc,v 1.52 1999-07-09 14:58:30 Singular Exp $ */
    88
    99#include <stdlib.h>
     
    12111211* utility for grammar and iparith
    12121212*/
    1213 extern BOOLEAN noringvars;
    12141213void syMake(leftv v,char * id, idhdl packhdl)
    12151214{
     
    13331332    {
    13341333      BOOLEAN ok=FALSE;
    1335       poly p = (!noringvars) ? pmInit(id,ok) : (poly)NULL;
     1334      poly p = (!yyInRingConstruction) ? pmInit(id,ok) : (poly)NULL;
    13361335      if (ok)
    13371336      {
     
    13631362    {
    13641363      BOOLEAN ok=FALSE;
    1365       poly p = ((currRingHdl!=NULL)&&(!noringvars)&&(IDLEV(currRingHdl)!=myynest))
    1366                /* ring required */  /* not in decl */    /* already in case 4/6 */
     1364      poly p = ((currRingHdl!=NULL)     /* ring required */
     1365               &&(!yyInRingConstruction) /* not in decl */
     1366               &&(IDLEV(currRingHdl)!=myynest)) /* already in case 4/6 */
    13671367                     ? pmInit(id,ok) : (poly)NULL;
    13681368      if (ok)
Note: See TracChangeset for help on using the changeset viewer.