Changeset 1590


Ignore:
Timestamp:
Oct 28, 2004, 5:00:58 AM (16 years ago)
Author:
orlov
Message:
  • retfail --> RF_RETFAIL
  • trap --> RF_TRAP
  • with --> RF_WITH
  • cleanup --> RF_CLEANUP
  • error --> RF_ERROR
File:
1 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/runtime/rf_macros.hh

    r1548 r1590  
    196196
    197197#ifndef RFRT_STINGY_STACK
    198 #define retfail \
     198#define RF_RETFAIL \
    199199  return false
    200200#else
    201 #define retfail \
     201#define RF_RETFAIL \
    202202  return __saved_top
    203203#endif
    204204
    205 #define trap \
     205#define RF_TRAP \
    206206  Expr* __trap_top = stack->get_top(); try
    207207
    208 #define with catch (Expr const& err)
    209 
    210 #define cleanup stack->destroy_results(__trap_top)
     208#define RF_WITH catch (Expr const& err)
     209
     210#ifndef RFRT_STINGY_STACK
     211#define RF_CLEANUP stack->cleanup(__trap_top)
     212#else
     213#define RF_CLEANUP stack->destroy_results(__trap_top)
     214#endif
    211215
    212216#ifdef RFRT_COMPATIBLE
    213 #define error(x) \
     217#define RF_ERROR(x) \
    214218  { \
    215219    Expr y = x; \
     
    217221  }
    218222#else
    219 #define error(x) throw (x)
     223#define RF_ERROR(x) throw (x)
    220224#endif
    221225
     
    235239    RF_CALL(Convert::To__Upper, (_res), (_res)); \
    236240    RF_CALL(Convert::To__Word,  (_res), (_res)); \
    237     error(_res + rftype::Word::Word(msg).to_symbol()); \
     241    RF_ERROR(_res + rftype::Word::Word(msg).to_symbol()); \
    238242  }
    239243#endif
Note: See TracChangeset for help on using the changeset viewer.