Changeset 4a8d95 in git for Singular/mpsr_Get.cc


Ignore:
Timestamp:
Nov 9, 1998, 4:43:05 PM (25 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
0d67d1a21775b2276749beabac94d42e5e4915b5
Parents:
4015fccbbf310b401abf655f858b2a5914c90eea
Message:
* reflect new MP/MPT changes


git-svn-id: file:///usr/local/Singular/svn/trunk@2651 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/mpsr_Get.cc

    r4015fcc r4a8d95  
    33****************************************/
    44
    5 /* $Id: mpsr_Get.cc,v 1.19 1998-10-15 11:46:03 obachman Exp $ */
     5/* $Id: mpsr_Get.cc,v 1.20 1998-11-09 15:43:03 obachman Exp $ */
    66/***************************************************************
    77 *
    … …  
    7676  fr(NodeCheck(node, MP_MatrixDict, MP_CopMatrixDenseVector));
    7777
    78   MPT_Tree_pt tree = MPT_GetProtoTypespec(node);
     78  MPT_Tree_pt tree = MPT_ProtoAnnotValue(node);
    7979  return tree != NULL && NodeCheck(tree->node, MP_CommonMetaType,
    8080                                   MP_ProtoDict, MP_CmtProtoIMP_Sint32);
    … …  
    8585  fr(NodeCheck(node, MP_MatrixDict, MP_CopMatrixDenseMatrix));
    8686
    87   MPT_Tree_pt tree = MPT_GetProtoTypespec(node);
     87  MPT_Tree_pt tree = MPT_ProtoAnnotValue(node);
    8888  return tree != NULL && NodeCheck(tree->node, MP_CommonMetaType,
    8989                                   MP_ProtoDict, MP_CmtProtoIMP_Sint32);
    … …  
    105105  return
    106106    NodeCheck(node, MP_PolyDict, MP_CopPolyDenseDistPoly) &&
    107     MPT_FindAnnot(node, MP_PolyDict, MP_AnnotPolyModuleVector) == NULL &&
     107    MPT_Annot(node, MP_PolyDict, MP_AnnotPolyModuleVector) == NULL &&
    108108    mpsr_GetRingAnnots(node, r, mv, IsUnOrdered) == MP_Success;
    109109}
    … …  
    117117  return
    118118    NodeCheck(node, MP_PolyDict, MP_CopPolyDenseDistPoly) &&
    119     MPT_FindAnnot(node, MP_PolyDict, MP_AnnotPolyModuleVector) != NULL &&
     119    MPT_Annot(node, MP_PolyDict, MP_AnnotPolyModuleVector) != NULL &&
    120120    mpsr_GetRingAnnots(node, r, mv, IsUnOrdered) == MP_Success;
    121121}
    … …  
    125125{
    126126  fr(NodeCheck(node, MP_PolyDict, MP_CopPolyIdeal));
    127   MPT_Tree_pt tree = MPT_GetProtoTypespec(node);
     127  MPT_Tree_pt tree = MPT_ProtoAnnotValue(node);
    128128  fr(tree != NULL);
    129129  node = tree->node;
    … …  
    137137{
    138138  fr(NodeCheck(node, MP_PolyDict, MP_CopPolyModule));
    139   MPT_Tree_pt tree = MPT_GetProtoTypespec(node);
     139  MPT_Tree_pt tree = MPT_ProtoAnnotValue(node);
    140140  fr(tree != NULL);
    141141  node = tree->node;
    … …  
    149149{
    150150  fr(NodeCheck(node, MP_MatrixDict, MP_CopMatrixDenseMatrix));
    151   MPT_Tree_pt tree = MPT_GetProtoTypespec(node);
     151  MPT_Tree_pt tree = MPT_ProtoAnnotValue(node);
    152152  fr(tree != NULL);
    153153  node = tree->node;
    … …  
    254254  mpsr_assume(MP_IsIdType(node->type));
    255255  char *id;
    256   MPT_Annot_pt proc_annot = MPT_FindAnnot(node, MP_SingularDict,
     256  MPT_Annot_pt proc_annot = MPT_Annot(node, MP_SingularDict,
    257257                                          MP_AnnotSingularProcDef);
    258258
    … …  
    330330    {
    331331        ring r = rCopy(mlv.r);
    332         r->order[0] = ringorder_lp;
     332        r->order[0] = ringorder_dp;
    333333        mpsr_rSetOrdSgn(r);
    334334        mpsr_MapLeftv(mlv.lv, mlv.r, r);
    … …  
    461461 
    462462
    463   if (MPT_GetProtoTypespec(node) != NULL)
     463  if (MPT_ProtoAnnotValue(node) != NULL)
    464464    return mpsr_SetError(mpsr_CanNotHandlePrototype);
    465465
    … …  
    515515  intvec *iv;
    516516  int row = node->numchild, col = 1, *v;
    517   MPT_Annot_pt annot = MPT_FindAnnot(node, MP_MatrixDict,
     517  MPT_Annot_pt annot = MPT_Annot(node, MP_MatrixDict,
    518518                                     MP_AnnotMatrixDimension);
    519519  if (annot != NULL &&
    … …  
    607607  ring r = mlv->r;
    608608  MP_Uint32_t nmon, rank = 1;
    609   MPT_Annot_pt annot = MPT_FindAnnot(node, MP_PolyDict,
     609  MPT_Annot_pt annot = MPT_Annot(node, MP_PolyDict,
    610610                                     MP_AnnotPolyModuleRank);
    611611  if (annot != NULL &&
    … …  
    636636  matrix mp;
    637637  MP_Uint32_t nmon;
    638   MPT_Annot_pt annot = MPT_FindAnnot(node, MP_MatrixDict,
     638  MPT_Annot_pt annot = MPT_Annot(node, MP_MatrixDict,
    639639                                     MP_AnnotMatrixDimension);
    640640  if (annot != NULL &&
    … …  
    727727  failr(mpsr_mp2tok(node->dict, MP_COMMON_T(node->nvalue), &tok));
    728728
    729   if ((typespec = MPT_GetProtoTypespec(node)) &&
     729  if ((typespec = MPT_ProtoAnnotValue(node)) &&
    730730      MPT_IsTrueProtoTypeSpec(typespec))
    731731    return mpsr_SetError(mpsr_CanNotHandlePrototype);
Note: See TracChangeset for help on using the changeset viewer.