Changeset 1816


Ignore:
Timestamp:
Dec 22, 2005, 10:07:04 PM (15 years ago)
Author:
orlov
Message:
  • Function Rfp2Cpp-With is added to the CppMangle? library.
Location:
to-imperative/trunk/library
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/library/CppMangle/CppMangle.cc

    r1778 r1816  
    11#include <rf_core.hh>
    2 #include <refal/Class.hh>
     2#include <refal/Apply.hh>
     3#include <refal/Convert.hh>
    34#include "reserved-c++.hh"
    45#include <refal/List.hh>
    5 #include <refal/Convert.hh>
     6#include <refal/Class.hh>
    67#include "CppMangle.hh"
    78
     
    9697static Expr _c_32;
    9798
     99static Expr _c_33;
     100
     101static Expr _c_34;
     102
    98103RF_FUNC (Rfp2Cpp, (RF_ARG _ve_rfp_m_obj;;), (RF_RES _v_res1;;))
     104  RF_TAILCALL (Rfp2Cpp_m_With, (_c_0, _ve_rfp_m_obj), _v_res1);
     105RF_END
     106
     107RF_FUNC (Rfp2Cpp_m_With, (RF_ARG _vs_Reserved_m_Word_q_, _ve_rfp_m_obj;;), (RF_RES _v_res1;;))
    99108  Expr _ve_ident;
    100109  {
     
    129138          }
    130139          uintptr_t _v_len__name__1 = (_v_len1 - _v_len2);
    131           if (!_c_0.term_eq (_v_deref__rfp_m_obj, 0))
     140          if (!_c_1.term_eq (_v_deref__rfp_m_obj, 0))
    132141          {
    133142            goto _block2__branch1;
    134143          }
    135144          Expr _v_name__1 (_v_deref__deref__rfp_m_obj, 0, _v_len__name__1);
    136           _ve_prefix = _c_1;
     145          _ve_prefix = _c_2;
    137146          _ve_name = _v_name__1;
    138147          goto _block2;
     
    165174          }
    166175          uintptr_t _v_len__name__12 = (_v_len3 - _v_len4);
    167           if (!_c_2.term_eq (_v_deref__rfp_m_obj2, 0))
     176          if (!_c_3.term_eq (_v_deref__rfp_m_obj2, 0))
    168177          {
    169178            goto _block2__branch2;
    170179          }
    171180          Expr _v_name__1 (_v_deref__deref__rfp_m_obj2, 0, _v_len__name__12);
    172           _ve_prefix = _c_3;
     181          _ve_prefix = _c_4;
    173182          _ve_name = _v_name__1;
    174183          goto _block2;
     
    201210          }
    202211          uintptr_t _v_len__name__13 = (_v_len5 - _v_len6);
    203           if (!_c_4.term_eq (_v_deref__rfp_m_obj3, 0))
     212          if (!_c_5.term_eq (_v_deref__rfp_m_obj3, 0))
    204213          {
    205214            goto _block2__branch3;
    206215          }
    207216          Expr _v_name__1 (_v_deref__deref__rfp_m_obj3, 0, _v_len__name__13);
    208           _ve_prefix = _c_5;
     217          _ve_prefix = _c_6;
    209218          _ve_name = _v_name__1;
    210219          goto _block2;
     
    237246          }
    238247          uintptr_t _v_len__name__14 = (_v_len7 - _v_len8);
    239           if (!_c_6.term_eq (_v_deref__rfp_m_obj4, 0))
     248          if (!_c_7.term_eq (_v_deref__rfp_m_obj4, 0))
    240249          {
    241250            goto _block2__branch4;
    242251          }
    243252          Expr _v_name__1 (_v_deref__deref__rfp_m_obj4, 0, _v_len__name__14);
    244           _ve_prefix = _c_7;
     253          _ve_prefix = _c_8;
    245254          _ve_name = _v_name__1;
    246255          goto _block2;
     
    273282          }
    274283          uintptr_t _v_len__name__15 = (_v_len9 - _v_len10);
    275           if (!_c_8.term_eq (_v_deref__rfp_m_obj5, 0))
     284          if (!_c_9.term_eq (_v_deref__rfp_m_obj5, 0))
    276285          {
    277286            goto _block2__branch5;
    278287          }
    279288          Expr _v_name__1 (_v_deref__deref__rfp_m_obj5, 0, _v_len__name__15);
    280           _ve_prefix = _c_9;
     289          _ve_prefix = _c_10;
    281290          _ve_name = _v_name__1;
    282291          goto _block2;
     
    309318          }
    310319          uintptr_t _v_len__name__16 = (_v_len11 - _v_len12);
    311           if (!_c_10.term_eq (_v_deref__rfp_m_obj6, 0))
     320          if (!_c_11.term_eq (_v_deref__rfp_m_obj6, 0))
    312321          {
    313322            goto _block2__branch6;
    314323          }
    315324          Expr _v_name__1 (_v_deref__deref__rfp_m_obj6, 0, _v_len__name__16);
    316           _ve_prefix = _c_11;
     325          _ve_prefix = _c_12;
    317326          _ve_name = _v_name__1;
    318327          goto _block2;
     
    344353        }
    345354        uintptr_t _v_len__name__17 = (_v_len13 - _v_len14);
    346         if (!_c_12.term_eq (_v_deref__rfp_m_obj7, 0))
     355        if (!_c_13.term_eq (_v_deref__rfp_m_obj7, 0))
    347356        {
    348357          goto _block1__branch1;
    349358        }
    350359        Expr _v_name__1 (_v_deref__deref__rfp_m_obj7, 0, _v_len__name__17);
    351         _ve_prefix = _c_13;
     360        _ve_prefix = _c_14;
    352361        _ve_name = _v_name__1;
    353362      }
     
    379388          }
    380389          uintptr_t _v_len__names = (_v_len15 - _v_len16);
    381           if (!_c_14.term_eq (_v_deref__rfp_m_obj8, 0))
     390          if (!_c_15.term_eq (_v_deref__rfp_m_obj8, 0))
    382391          {
    383392            goto _block3__branch1;
     
    414423        if ((_v_len19 < _v_len20))
    415424        {
    416           RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Rfp2Cpp") + unexpected_fail);
     425          RF_FUNC_ERROR (unexpected_fail);
    417426        }
    418427        uintptr_t _v_len__names3 = (_v_len19 - _v_len20);
     
    435444      Expr _vs_name (_v_auxblock1, _v_len__qualifiers, 1);
    436445      Expr _v_Map1;
    437       RF_CALL (List::Map, (_c_15, empty, _ve_qualifiers), _v_Map1);
     446      RF_CALL (List::Map, (_c_16, empty, _ve_qualifiers), _v_Map1);
    438447      Expr _v_Chars2Cpp2;
    439448      RF_CALL (Chars2Cpp, _vs_name, _v_Chars2Cpp2);
     
    447456  {
    448457    {
    449       if (!RF_CALL (reserved_m_c_p__p_::Reserved_m_Word_q_, _ve_ident, /*void*/))
     458      Expr _v_Apply1;
     459      if (!RF_CALL (Apply::Apply, (_vs_Reserved_m_Word_q_, _ve_ident), _v_Apply1))
    450460      {
    451461        goto _block4__branch1;
    452462      }
    453       _v_res1 = (_c_16 + _ve_ident);
     463      uintptr_t _v_len23 = _v_Apply1.get_len ();
     464      uintptr_t _v_len24 = 0;
     465      if ((_v_len23 < _v_len24))
     466      {
     467        goto _block4__branch1;
     468      }
     469      uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_79_m_41 = (_v_len23 - _v_len24);
     470      Expr _ve__e__e_tmp_m_CppManglerf_m_79_m_41 (_v_Apply1, 0, _v_len___e__e_tmp_m_CppManglerf_m_79_m_41);
     471      _v_res1 = (_c_17 + _ve_ident);
    454472      goto _block4;
    455473    }
     
    463481  if ((_v_arg1.get_len () != 1))
    464482  {
    465     RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Qualifier2Cpp") + unexpected_fail);
     483    RF_FUNC_ERROR (unexpected_fail);
    466484  }
    467485  if (!_v_arg1.symbol_at (0))
    468486  {
    469     RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Qualifier2Cpp") + unexpected_fail);
     487    RF_FUNC_ERROR (unexpected_fail);
    470488  }
    471489  Expr _vs_qualifier (_v_arg1, 0, 1);
    472490  Expr _v_Chars2Cpp1;
    473491  RF_CALL (Chars2Cpp, _vs_qualifier, _v_Chars2Cpp1);
    474   _v_res1 = (_v_Chars2Cpp1 + _c_17);
     492  _v_res1 = (_v_Chars2Cpp1 + _c_18);
    475493RF_END
    476494
     
    478496  Expr _v_To_m_Chars1;
    479497  RF_CALL (Convert::To_m_Chars, _ve_name, _v_To_m_Chars1);
    480   RF_TAILCALL (List::Map, (_c_18, empty, _v_To_m_Chars1), _v_res1);
     498  RF_TAILCALL (List::Map, (_c_19, empty, _v_To_m_Chars1), _v_res1);
    481499RF_END
    482500
     
    484502  if ((_v_arg1.get_len () != 1))
    485503  {
    486     RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("A-Char2Cpp") + unexpected_fail);
     504    RF_FUNC_ERROR (unexpected_fail);
    487505  }
    488506  if (!_v_arg1.symbol_at (0))
    489507  {
    490     RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("A-Char2Cpp") + unexpected_fail);
     508    RF_FUNC_ERROR (unexpected_fail);
    491509  }
    492510  Expr _vs_char (_v_arg1, 0, 1);
     
    507525      }
    508526      {
    509         lsplit (_c_19, 0, _ve__e__e_tmp_m_CppManglerf_m_87_m_34, _v_lsplit__19);
    510         for ( ; ; iter(_c_19)++)
    511         {
    512           {
    513             if (!iter(_c_19))
     527        lsplit (_c_20, 0, _ve__e__e_tmp_m_CppManglerf_m_89_m_34, _v_lsplit__20);
     528        for ( ; ; iter(_c_20)++)
     529        {
     530          {
     531            if (!iter(_c_20))
    514532            {
    515533              goto _negation1;
    516534            }
    517             uintptr_t _v_len1 = _v_lsplit__19.get_len ();
     535            uintptr_t _v_len1 = _v_lsplit__20.get_len ();
    518536            uintptr_t _v_len2 = 1;
    519537            if ((_v_len1 < _v_len2))
     
    521539              goto _negation1;
    522540            }
    523             uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_87_m_43 = (_v_len1 - _v_len2);
    524             if (!_vs_char.term_eq (_v_lsplit__19, 0))
     541            uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_89_m_43 = (_v_len1 - _v_len2);
     542            if (!_vs_char.term_eq (_v_lsplit__20, 0))
    525543            {
    526544              goto _continue1;
    527545            }
    528             Expr _ve__e__e_tmp_m_CppManglerf_m_87_m_43 (_v_lsplit__19, 1, _v_len___e__e_tmp_m_CppManglerf_m_87_m_43);
     546            Expr _ve__e__e_tmp_m_CppManglerf_m_89_m_43 (_v_lsplit__20, 1, _v_len___e__e_tmp_m_CppManglerf_m_89_m_43);
    529547            goto _exit1;
    530548          }
     
    540558  _block1__branch2: {}
    541559    {
    542       lsplit (Conv_m_Table, 0, _ve__e__e_tmp_m_CppManglerf_m_88_m_18, _v_lsplit__Conv_m_Table);
     560      lsplit (Conv_m_Table, 0, _ve__e__e_tmp_m_CppManglerf_m_90_m_18, _v_lsplit__Conv_m_Table);
    543561      for ( ; ; iter(Conv_m_Table)++)
    544562      {
     
    554572            goto _block1__branch3;
    555573          }
    556           uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_88_m_36 = (_v_len3 - _v_len4);
     574          uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_90_m_36 = (_v_len3 - _v_len4);
    557575          if (_v_lsplit__Conv_m_Table.symbol_at (0))
    558576          {
     
    571589            goto _continue2;
    572590          }
    573           Expr _ve__e__e_tmp_m_CppManglerf_m_88_m_36 (_v_lsplit__Conv_m_Table, 1, _v_len___e__e_tmp_m_CppManglerf_m_88_m_36);
     591          Expr _ve__e__e_tmp_m_CppManglerf_m_90_m_36 (_v_lsplit__Conv_m_Table, 1, _v_len___e__e_tmp_m_CppManglerf_m_90_m_36);
    574592          Expr _ve_code (_v_deref__lsplit__Conv_m_Table, 1, _v_len__code);
    575           _v_res1 = (_c_13 + _ve_code + _c_13);
     593          _v_res1 = (_c_14 + _ve_code + _c_14);
    576594          goto _exit2;
    577595        }
     
    584602    Expr _v_Char_m_To_m_Unicode1;
    585603    RF_CALL (Char_m_To_m_Unicode, _vs_char, _v_Char_m_To_m_Unicode1);
    586     _v_res1 = (_c_13 + _v_Char_m_To_m_Unicode1 + _c_13);
     604    _v_res1 = (_c_14 + _v_Char_m_To_m_Unicode1 + _c_14);
    587605  }
    588606_block1: {}
     
    592610  {
    593611    {
    594       if (!_v_arg1.term_eq (_c_20, 0))
     612      if (!_v_arg1.term_eq (_c_21, 0))
    595613      {
    596614        goto _block1__branch1;
    597615      }
    598       _v_res1 = _c_21;
     616      _v_res1 = _c_22;
    599617      goto _block1;
    600618    }
    601619  _block1__branch1: {}
    602620    {
    603       if (!_v_arg1.term_eq (_c_22, 0))
     621      if (!_v_arg1.term_eq (_c_23, 0))
    604622      {
    605623        goto _block1__branch2;
    606624      }
    607       _v_res1 = _c_23;
     625      _v_res1 = _c_24;
    608626      goto _block1;
    609627    }
    610628  _block1__branch2: {}
    611629    {
    612       if (!_v_arg1.term_eq (_c_24, 0))
     630      if (!_v_arg1.term_eq (_c_25, 0))
    613631      {
    614632        goto _block1__branch3;
    615633      }
    616       _v_res1 = _c_25;
     634      _v_res1 = _c_26;
    617635      goto _block1;
    618636    }
    619637  _block1__branch3: {}
    620638    {
    621       if (!_v_arg1.term_eq (_c_26, 0))
     639      if (!_v_arg1.term_eq (_c_27, 0))
    622640      {
    623641        goto _block1__branch4;
    624642      }
    625       _v_res1 = _c_27;
     643      _v_res1 = _c_28;
    626644      goto _block1;
    627645    }
    628646  _block1__branch4: {}
    629647    {
    630       if (!_v_arg1.term_eq (_c_28, 0))
     648      if (!_v_arg1.term_eq (_c_29, 0))
    631649      {
    632650        goto _block1__branch5;
    633651      }
    634       _v_res1 = _c_29;
     652      _v_res1 = _c_30;
    635653      goto _block1;
    636654    }
    637655  _block1__branch5: {}
    638     if (!_v_arg1.term_eq (_c_30, 0))
    639     {
    640       RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Char-To-Unicode") + unexpected_fail);
    641     }
    642     _v_res1 = _c_31;
     656    if (!_v_arg1.term_eq (_c_31, 0))
     657    {
     658      RF_FUNC_ERROR (unexpected_fail);
     659    }
     660    _v_res1 = _c_32;
    643661  }
    644662_block1: {}
     
    658676      }
    659677      uintptr_t _v_len__name = (_v_len1 - _v_len2);
    660       if (!_c_16.eq (_v_To_m_Chars1, 0))
     678      if (!_c_17.eq (_v_To_m_Chars1, 0))
    661679      {
    662680        goto _block1__branch1;
     
    671689    if ((_v_len3 < _v_len4))
    672690    {
    673       RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Cpp2Rfp") + unexpected_fail);
     691      RF_FUNC_ERROR (unexpected_fail);
    674692    }
    675693    uintptr_t _v_len__name2 = (_v_len3 - _v_len4);
     
    687705      }
    688706      uintptr_t _v_len__name3 = (_v_len5 - _v_len6);
    689       if (!_c_3.eq (_v_auxblock1, 0))
     707      if (!_c_4.eq (_v_auxblock1, 0))
    690708      {
    691709        goto _block2__branch1;
     
    697715        RF_RETFAIL;
    698716      }
    699       _v_res1 = (_c_2 + _v_Chars2Rfp1 ()) ();
     717      _v_res1 = (_c_3 + _v_Chars2Rfp1 ()) ();
    700718      goto _block2;
    701719    }
     
    709727      }
    710728      uintptr_t _v_len__name4 = (_v_len7 - _v_len8);
    711       if (!_c_5.eq (_v_auxblock1, 0))
     729      if (!_c_6.eq (_v_auxblock1, 0))
    712730      {
    713731        goto _block2__branch2;
     
    719737        RF_RETFAIL;
    720738      }
    721       _v_res1 = (_c_4 + _v_Chars2Rfp2 ()) ();
     739      _v_res1 = (_c_5 + _v_Chars2Rfp2 ()) ();
    722740      goto _block2;
    723741    }
     
    731749      }
    732750      uintptr_t _v_len__name5 = (_v_len9 - _v_len10);
    733       if (!_c_7.eq (_v_auxblock1, 0))
     751      if (!_c_8.eq (_v_auxblock1, 0))
    734752      {
    735753        goto _block2__branch3;
     
    741759        RF_RETFAIL;
    742760      }
    743       _v_res1 = (_c_6 + _v_Chars2Rfp3 ()) ();
     761      _v_res1 = (_c_7 + _v_Chars2Rfp3 ()) ();
    744762      goto _block2;
    745763    }
     
    753771      }
    754772      uintptr_t _v_len__name6 = (_v_len11 - _v_len12);
    755       if (!_c_9.eq (_v_auxblock1, 0))
     773      if (!_c_10.eq (_v_auxblock1, 0))
    756774      {
    757775        goto _block2__branch4;
     
    763781        RF_RETFAIL;
    764782      }
    765       _v_res1 = (_c_8 + _v_Chars2Rfp4 ()) ();
     783      _v_res1 = (_c_9 + _v_Chars2Rfp4 ()) ();
    766784      goto _block2;
    767785    }
     
    802820          }
    803821          uintptr_t _v_len__rest = (_v_len1 - _v_len2);
    804           if (!_c_17.eq (_v_lsplit__arg1, 0))
     822          if (!_c_18.eq (_v_lsplit__arg1, 0))
    805823          {
    806824            goto _continue1;
     
    850868        goto _block1__branch1;
    851869      }
    852       if (!_c_13.term_eq (_v_arg1, 0))
     870      if (!_c_14.term_eq (_v_arg1, 0))
    853871      {
    854872        goto _block1__branch1;
     
    870888          }
    871889          uintptr_t _v_len__rest = (_v_len1 - _v_len2);
    872           if (!_c_13.term_eq (_v_lsplit__arg1, 0))
     890          if (!_c_14.term_eq (_v_lsplit__arg1, 0))
    873891          {
    874892            goto _continue1;
    875893          }
    876894          Expr _ve_rest (_v_lsplit__arg1, 1, _v_len__rest);
    877           lsplit (Conv_m_Table, 0, _ve__e__e_tmp_m_CppManglerf_m_131_m_20, _v_lsplit__Conv_m_Table);
     895          lsplit (Conv_m_Table, 0, _ve__e__e_tmp_m_CppManglerf_m_133_m_20, _v_lsplit__Conv_m_Table);
    878896          for ( ; ; iter(Conv_m_Table)++)
    879897          {
     
    889907                RF_RETFAIL;
    890908              }
    891               uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_131_m_38 = (_v_len3 - _v_len4);
     909              uintptr_t _v_len___e__e_tmp_m_CppManglerf_m_133_m_38 = (_v_len3 - _v_len4);
    892910              if (_v_lsplit__Conv_m_Table.symbol_at (0))
    893911              {
     
    907925                goto _continue2;
    908926              }
    909               Expr _ve__e__e_tmp_m_CppManglerf_m_131_m_38 (_v_lsplit__Conv_m_Table, 1, _v_len___e__e_tmp_m_CppManglerf_m_131_m_38);
     927              Expr _ve__e__e_tmp_m_CppManglerf_m_133_m_38 (_v_lsplit__Conv_m_Table, 1, _v_len___e__e_tmp_m_CppManglerf_m_133_m_38);
    910928              Expr _vs_char (_v_deref__lsplit__Conv_m_Table, 0, 1);
    911929              Expr _v_Codes2Rfp1;
     
    956974        }
    957975        {
    958           if (!_vs_char.term_eq (_c_32, 0))
     976          if (!_vs_char.term_eq (_c_33, 0))
    959977          {
    960978            goto _negation1;
     
    976994    if ((_v_arg1.get_len () != 0))
    977995    {
    978       RF_ERROR (Expr::create<Word>("CppMangle") + Expr::create<Word>("Codes2Rfp") + unexpected_fail);
     996      RF_FUNC_ERROR (unexpected_fail);
    979997    }
    980998    _v_res1 = empty;
     
    9831001RF_END
    9841002
    985 }
    986 
    987 namespace CppMangle
    988 {
     1003RF_FUNC (Reserved_m_Word_q___0, (RF_ARG _v_arg1;;), (RF_RES _v_res1;;))
     1004  uintptr_t _v_len1 = _v_arg1.get_len ();
     1005  uintptr_t _v_len2 = 0;
     1006  if ((_v_len1 < _v_len2))
     1007  {
     1008    RF_ERROR (_c_34);
     1009  }
     1010  uintptr_t _v_len__stub1 = (_v_len1 - _v_len2);
     1011  Expr _v_stub1 (_v_arg1, 0, _v_len__stub1);
     1012  if (!RF_CALL (reserved_m_c_p__p_::Reserved_m_Word_q_, _v_stub1, /*void*/))
     1013  {
     1014    RF_RETFAIL;
     1015  }
     1016  _v_res1 = empty;
     1017RF_END
    9891018
    9901019static void init_ ()
    9911020{
    9921021  Conv_m_Table = (Char::create_expr ("!e")) () + (Char::create_expr ("?q")) () + (Char::create_expr ("_")) () + (Char::create_expr ("-m")) () + (Char::create_expr ("+p")) () + (Char::create_expr ("<lt")) () + (Char::create_expr (">gt")) () + (Char::create_expr ("=eq")) () + (Char::create_expr ("*a")) () + (Char::create_expr ("/s")) () + (Char::create_expr (" sp")) () + (Char::create_expr ("\\bs")) () + (Char::create_expr ("|bar")) () + (Char::create_expr ("~tilde")) () + (Char::create_expr ("@at")) () + (Char::create_expr ("#num")) () + (Char::create_expr ("$dollar")) () + (Char::create_expr ("%percnt")) () + (Char::create_expr ("^circ")) () + (Char::create_expr ("&amp")) () + (Char::create_expr ("(lpar")) () + (Char::create_expr (")rpar")) () + (Char::create_expr ("[lsqb")) () + (Char::create_expr ("]rsqb")) () + (Char::create_expr ("{lcub")) () + (Char::create_expr ("}rcub")) () + (Char::create_expr ("`grave")) () + (Char::create_expr ("'apos")) () + (Char::create_expr ("\"quot")) () + (Char::create_expr (",comma")) () + (Char::create_expr (".period")) () + (Char::create_expr (":colon")) () + (Char::create_expr (";semi")) ();
    993   _c_0 = Expr::create<Word>("VAR");
    994   _c_1 = Char::create_expr ("_v_");
    995   _c_2 = Expr::create<Word>("EVAR");
    996   _c_3 = Char::create_expr ("_ve_");
    997   _c_4 = Expr::create<Word>("VVAR");
    998   _c_5 = Char::create_expr ("_vv_");
    999   _c_6 = Expr::create<Word>("TVAR");
    1000   _c_7 = Char::create_expr ("_vt_");
    1001   _c_8 = Expr::create<Word>("SVAR");
    1002   _c_9 = Char::create_expr ("_vs_");
    1003   _c_10 = Expr::create<Word>("STATIC");
    1004   _c_11 = Char::create_expr ("_c_");
    1005   _c_12 = Expr::create<Word>("LABEL");
    1006   _c_13 = Expr (_c_11, 0, 1);
    1007   _c_14 = Expr::create<Word>("OBJ");
    1008   _c_15 = Expr::create_sym<Func> (Qualifier2Cpp);
    1009   _c_16 = Char::create_expr ("_r_");
    1010   _c_17 = Char::create_expr ("::");
    1011   _c_18 = Expr::create_sym<Func> (A_m_Char2Cpp);
    1012   _c_19 = Char::create_expr ("?!");
    1013   _c_20 = Char::create_expr ("b");
    1014   _c_21 = Char::create_expr ("08");
    1015   _c_22 = Char::create_expr ("\t");
    1016   _c_23 = Char::create_expr ("09");
    1017   _c_24 = Char::create_expr ("\n");
    1018   _c_25 = Char::create_expr ("0A");
    1019   _c_26 = Expr (_c_9, 1, 1);
    1020   _c_27 = Char::create_expr ("0B");
    1021   _c_28 = Char::create_expr ("f");
    1022   _c_29 = Char::create_expr ("0C");
    1023   _c_30 = Char::create_expr ("\r");
    1024   _c_31 = Char::create_expr ("0D");
    1025   _c_32 = Expr (_c_19, 0, 1);
     1022  _c_0 = Expr::create_sym<Func> (Reserved_m_Word_q___0);
     1023  _c_1 = Expr::create<Word>("VAR");
     1024  _c_2 = Char::create_expr ("_v_");
     1025  _c_3 = Expr::create<Word>("EVAR");
     1026  _c_4 = Char::create_expr ("_ve_");
     1027  _c_5 = Expr::create<Word>("VVAR");
     1028  _c_6 = Char::create_expr ("_vv_");
     1029  _c_7 = Expr::create<Word>("TVAR");
     1030  _c_8 = Char::create_expr ("_vt_");
     1031  _c_9 = Expr::create<Word>("SVAR");
     1032  _c_10 = Char::create_expr ("_vs_");
     1033  _c_11 = Expr::create<Word>("STATIC");
     1034  _c_12 = Char::create_expr ("_c_");
     1035  _c_13 = Expr::create<Word>("LABEL");
     1036  _c_14 = Expr (_c_12, 0, 1);
     1037  _c_15 = Expr::create<Word>("OBJ");
     1038  _c_16 = Expr::create_sym<Func> (Qualifier2Cpp);
     1039  _c_17 = Char::create_expr ("_r_");
     1040  _c_18 = Char::create_expr ("::");
     1041  _c_19 = Expr::create_sym<Func> (A_m_Char2Cpp);
     1042  _c_20 = Char::create_expr ("?!");
     1043  _c_21 = Char::create_expr ("b");
     1044  _c_22 = Char::create_expr ("08");
     1045  _c_23 = Char::create_expr ("\t");
     1046  _c_24 = Char::create_expr ("09");
     1047  _c_25 = Char::create_expr ("\n");
     1048  _c_26 = Char::create_expr ("0A");
     1049  _c_27 = Expr (_c_2, 1, 1);
     1050  _c_28 = Char::create_expr ("0B");
     1051  _c_29 = Char::create_expr ("f");
     1052  _c_30 = Char::create_expr ("0C");
     1053  _c_31 = Char::create_expr ("\r");
     1054  _c_32 = Char::create_expr ("0D");
     1055  _c_33 = Expr (_c_20, 0, 1);
     1056  _c_34 = Expr::create<Word>("Apply") + Expr::create<Word>("Apply") + Expr::create<Word>("Unexpected fail");
    10261057}
    10271058
  • to-imperative/trunk/library/CppMangle/CppMangle.hh

    r1704 r1816  
    1414RF_DECL (Rfp2Cpp);
    1515
     16RF_DECL (Rfp2Cpp_m_With);
     17
    1618RF_DECL (Cpp2Rfp);
    1719
  • to-imperative/trunk/library/CppMangle/refal/CppMangle.rf

    r1704 r1816  
    33// $Date$
    44
    5 $use Class Convert List;
     5$use Apply Class Convert List;
    66
    77$use "reserved-c++";  // import $func? Reserved-Word?;
     
    5555
    5656
    57 Rfp2Cpp e.rfp-obj, {
     57Rfp2Cpp e.rfp-obj = <Rfp2Cpp-With &Reserved-Word? e.rfp-obj>;
     58
     59Rfp2Cpp-With s.Reserved-Word? e.rfp-obj, {
    5860  e.rfp-obj : \{
    5961    (VAR (e.name)) = ('_v_') e.name;
     
    7577} :: e.ident,
    7678  {
    77     <Reserved-Word? e.ident> = '_r_' e.ident;
     79    <Apply s.Reserved-Word? e.ident> : e = '_r_' e.ident;
    7880    e.ident;
    7981  };
  • to-imperative/trunk/library/CppMangle/refal/CppMangle.rfi

    r1704 r1816  
    44
    55$func Rfp2Cpp e.rfp-obj = e.cpp-identifier;
     6$func Rfp2Cpp-With s.Reserved-Word?-Func e.rfp-obj = e.cpp-identifier;
    67
    78$func? Cpp2Rfp e.cpp-identifier = e.rfp-name;
  • to-imperative/trunk/library/JavaMangle/JavaMangle.cc

    r1815 r1816  
    88
    99using namespace rfrt;
    10 
    11 namespace reserved_m_java
    12 {
    13 
    14 RF_DECL (Reserved_m_Word_q___0);
    15 
    16 }
    1710
    1811namespace JavaMangle
  • to-imperative/trunk/library/include/refal-plus/CppMangle.rfi

    r1704 r1816  
    44
    55$func Rfp2Cpp e.rfp-obj = e.cpp-identifier;
     6$func Rfp2Cpp-With s.Reserved-Word?-Func e.rfp-obj = e.cpp-identifier;
    67
    78$func? Cpp2Rfp e.cpp-identifier = e.rfp-name;
  • to-imperative/trunk/library/include/refal/CppMangle.hh

    r1704 r1816  
    1414RF_DECL (Rfp2Cpp);
    1515
     16RF_DECL (Rfp2Cpp_m_With);
     17
    1618RF_DECL (Cpp2Rfp);
    1719
Note: See TracChangeset for help on using the changeset viewer.