Changeset 518a1f in git


Ignore:
Timestamp:
Jun 29, 1998, 4:37:00 PM (26 years ago)
Author:
Jens Schmidt <schmidt@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
12223ddcbd1a799cd7cdde67969851c072107d26
Parents:
40edbfe88d4432f89635b26bfd7231f930259c04
Message:
	* canonicalform.h (class CanonicalForm): friend declarations for
	  `operator -', `operator +', `operator *', `operator /',
 	  `operator %', `div', `mod' replaced by ordinary declarations

	* canonicalform.cc, canonicalform.h (CanonicalForm,
	  ~CanonicalForm, isOne, isZero, operator =): definitions of
 	  methods moved to `cf_inline.cc'.  Declarations marked as
 	  `CF_INLINE' or `CF_NO_INLINE', resp.
	  (operator -, operator +, operator *, operator /, operator %,
	  div, mod): definitions of operators moved to `cf_inline.cc'.
  	  Declarations marked as `CF_INLINE' or `CF_NO_INLINE', resp.
	* canonicalform.h (CF_INLINE, CF_NO_INLINE): new #defines.
	  `cf_iter_inline.cc' (conditionally) #included.


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

Legend:

Unmodified
Added
Removed
  • factory/canonicalform.h

    r40edbfe r518a1f  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: canonicalform.h,v 1.24 1998-03-12 10:28:35 schmidt Exp $ */
     2/* $Id: canonicalform.h,v 1.25 1998-06-29 14:37:00 schmidt Exp $ */
    33
    44#ifndef INCL_CANONICALFORM_H
     
    1717#include "ftmpl_factor.h"
    1818#include "ftmpl_matrix.h"
     19
     20/*BEGINPUBLIC*/
     21
     22#undef CF_INLINE
     23#define CF_INLINE
     24#undef CF_NO_INLINE
     25#define CF_NO_INLINE
     26
     27/*ENDPUBLIC*/
     28
     29#ifdef CF_USE_INLINE
     30#undef CF_INLINE
     31#define CF_INLINE inline
     32#else
     33#undef CF_INLINE
     34#define CF_INLINE
     35#endif
    1936
    2037/*BEGINPUBLIC*/
     
    3350public:
    3451    // constructors, destructors, selectors
    35     CanonicalForm();
    36     CanonicalForm( const CanonicalForm& );
    37     CanonicalForm( InternalCF* );
    38     CanonicalForm( const int );
    39     CanonicalForm( const Variable & );
    40     CanonicalForm( const Variable &, int );
     52    CF_INLINE CanonicalForm();
     53    CF_INLINE CanonicalForm( const CanonicalForm& );
     54    CF_INLINE CanonicalForm( InternalCF* );
     55    CF_INLINE CanonicalForm( const int );
     56    CF_INLINE CanonicalForm( const Variable & );
     57    CF_INLINE CanonicalForm( const Variable &, int );
    4158    CanonicalForm( const char * ); // use with caution - does only handle integers !!!
    4259
    43     ~CanonicalForm();
     60    CF_NO_INLINE ~CanonicalForm();
    4461
    4562    InternalCF* getval() const; // use with caution !!!
     
    4865
    4966    // predicates
    50     bool isOne() const;
    51     bool isZero() const;
     67    CF_NO_INLINE bool isOne() const;
     68    CF_NO_INLINE bool isZero() const;
    5269    bool isImm() const;
    5370
     
    88105
    89106    // assignment operators
    90     CanonicalForm& operator = ( const CanonicalForm& );
    91     CanonicalForm& operator = ( const int );
     107    CF_NO_INLINE CanonicalForm& operator = ( const CanonicalForm& );
     108    CF_NO_INLINE CanonicalForm& operator = ( const int );
    92109
    93110    CanonicalForm& operator += ( const CanonicalForm& );
     
    119136
    120137    // arithmetic operators
    121     friend CanonicalForm operator - ( const CanonicalForm& );
    122 
    123     friend CanonicalForm operator + ( const CanonicalForm&, const CanonicalForm& );
    124     friend CanonicalForm operator - ( const CanonicalForm&, const CanonicalForm& );
    125     friend CanonicalForm operator * ( const CanonicalForm&, const CanonicalForm& );
    126     friend CanonicalForm operator / ( const CanonicalForm&, const CanonicalForm& );
    127     friend CanonicalForm operator % ( const CanonicalForm&, const CanonicalForm& );
    128 
    129     friend CanonicalForm div ( const CanonicalForm&, const CanonicalForm& );
    130     friend CanonicalForm mod ( const CanonicalForm&, const CanonicalForm& );
     138    friend CF_NO_INLINE CanonicalForm operator - ( const CanonicalForm& );
    131139
    132140    friend void divrem ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
     
    151159};
    152160//}}}
     161
     162CF_INLINE CanonicalForm
     163operator + ( const CanonicalForm&, const CanonicalForm& );
     164
     165CF_NO_INLINE CanonicalForm
     166operator - ( const CanonicalForm&, const CanonicalForm& );
     167
     168CF_INLINE CanonicalForm
     169operator * ( const CanonicalForm&, const CanonicalForm& );
     170
     171CF_NO_INLINE CanonicalForm
     172operator / ( const CanonicalForm&, const CanonicalForm& );
     173
     174CF_NO_INLINE CanonicalForm
     175operator % ( const CanonicalForm&, const CanonicalForm& );
     176
     177CF_NO_INLINE CanonicalForm
     178div ( const CanonicalForm&, const CanonicalForm& );
     179
     180CF_NO_INLINE CanonicalForm
     181mod ( const CanonicalForm&, const CanonicalForm& );
     182
     183/*ENDPUBLIC*/
     184
     185#ifdef CF_USE_INLINE
     186#include "cf_inline.cc"
     187#endif
     188
     189/*BEGINPUBLIC*/
    153190
    154191//{{{ function declarations from canonicalform.cc
Note: See TracChangeset for help on using the changeset viewer.