Changeset 5c2863 in git
 Timestamp:
 Aug 16, 1999, 5:44:10 PM (25 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
 Children:
 7740604d0cc6770e796032176241c59435e5cf19
 Parents:
 a7f305593f8bd2209cc0e1272144ed6795eb346a
 Location:
 Singular
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

Singular/spectrum.cc
ra7f305 r5c2863 870 870 if( currRing>OrdSgn != 1 ) 871 871 // ?? HS: the test above is also true for k[x][[y]], k[[x]][y] 872 // or should we use: 872 873 //if( !ringIsLocal( ) ) 873 874 { … … 1287 1288 BOOLEAN semicProc3 ( leftv res,leftv u,leftv v,leftv w ) 1288 1289 { 1289 semicState state; 1290 BOOLEAN qh=((int)w>Data())==1); 1291 1292 //  1293 // check arguments 1294 //  1295 1296 lists l1 = (lists)first>Data( ); 1297 lists l2 = (lists)second>Data( ); 1298 1299 if( (state=list_is_spectrum( l1 ))!=semicOK ) 1300 { 1301 WerrorS( "first argument is not a spectrum" ); 1302 list_error( state ); 1303 } 1304 else if( (state=list_is_spectrum( l2 ))!=semicOK ) 1305 { 1306 WerrorS( "second argument is not a spectrum" ); 1307 list_error( state ); 1308 } 1290 semicState state; 1291 BOOLEAN qh=((int)w>Data())==1); 1292 1293 //  1294 // check arguments 1295 //  1296 1297 lists l1 = (lists)first>Data( ); 1298 lists l2 = (lists)second>Data( ); 1299 1300 if( (state=list_is_spectrum( l1 ))!=semicOK ) 1301 { 1302 WerrorS( "first argument is not a spectrum" ); 1303 list_error( state ); 1304 } 1305 else if( (state=list_is_spectrum( l2 ))!=semicOK ) 1306 { 1307 WerrorS( "second argument is not a spectrum" ); 1308 list_error( state ); 1309 } 1310 else 1311 { 1312 spectrum s1( l1 ); 1313 spectrum s2( l2 ); 1314 1315 result>rtyp = INT_CMD; 1316 if (qh) 1317 result>data = (void*)(s1.mult_spectrumh( s2 )); 1309 1318 else 1310 { 1311 spectrum s1( l1 ); 1312 spectrum s2( l2 ); 1313 1314 result>rtyp = INT_CMD; 1315 if (qh) 1316 result>data = (void*)(s1.mult_spectrumh( s2 )); 1317 else 1318 result>data = (void*)(s1.mult_spectrum( s2 )); 1319 } 1320 1321 //  1322 // check status 1323 //  1324 1325 return (state!=semicOK); 1319 result>data = (void*)(s1.mult_spectrum( s2 )); 1320 } 1321 1322 //  1323 // check status 1324 //  1325 1326 return (state!=semicOK); 1326 1327 } 1327 1328 BOOLEAN semicProc ( leftv res,leftv u,leftv v ) 
Singular/tok.h
ra7f305 r5c2863 7 7 * ABSTRACT: tokens, types for interpreter; general macros 8 8 */ 9 /* $Id: tok.h,v 1.2 6 19990813 17:12:22Singular Exp $ */9 /* $Id: tok.h,v 1.27 19990816 15:43:57 Singular Exp $ */ 10 10 11 11 #ifndef MYYSTYPE … … 106 106 SPECTRUM_CMD, 107 107 SEMIC_CMD, 108 SEMICH_CMD,109 108 #endif 110 109 SQR_FREE_DEC_CMD,
Note: See TracChangeset
for help on using the changeset viewer.