← Back to branch summary

~ubuntu-branches/ubuntu/wily/aspectc++/wily

« back to all changes in this revision

Viewing changes to Puma/src/parser/cparser/CSemDeclSpecs.cc

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-06-15 10:17:02 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090615101702-qsr30iptwbxylmo2
Tags: 1.0pre4~svn.20090615-1
* New upstream release.
* don't ignore errors in the postrm script
* avoid spurious creation of empty dir ./usr/sbin/
* improve short descriptions of libpuma-doc and libpuma-dev
* bump Standards-Version to 3.8.1
* bump debhelper compat level to level 7 (latest in stable)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Puma/src/parser/cparser/CSemDeclSpecs.cc
147
147
      case CT_PrimDeclSpec::PDS_CHAR:
148
148
      case CT_PrimDeclSpec::PDS_WCHAR_T:
149
149
      case CT_PrimDeclSpec::PDS_BOOL:
 
150
      case CT_PrimDeclSpec::PDS_C_BOOL:
150
151
      case CT_PrimDeclSpec::PDS_INT:
151
152
      case CT_PrimDeclSpec::PDS_INT64:
152
153
      case CT_PrimDeclSpec::PDS_FLOAT:
210
211
  if ((_prim_map[CT_PrimDeclSpec::PDS_SIGNED] || 
211
212
       _prim_map[CT_PrimDeclSpec::PDS_UNSIGNED]) &&
212
213
      (_prim_map[CT_PrimDeclSpec::PDS_BOOL] || 
 
214
       _prim_map[CT_PrimDeclSpec::PDS_C_BOOL] || 
213
215
       _prim_map[CT_PrimDeclSpec::PDS_FLOAT] || 
214
216
       _prim_map[CT_PrimDeclSpec::PDS_DOUBLE] || 
215
217
       _prim_map[CT_PrimDeclSpec::PDS_VOID] ||
244
246
  // --------------------------------------------- //
245
247
  //  void                 | "void"                //
246
248
  //  bool                 | "bool"                //       
 
249
  //  _Bool                | "_Bool"               //       
247
250
  //  wchar_t              | "wchar_t"             //       
248
251
  //                       |                       //
249
252
  //  char                 | "char"                //       
279
282
    _prim_map[CT_PrimDeclSpec::PDS_BOOL] = 0;
280
283
    type = &CTYPE_BOOL;
281
284
  }
 
285
  // handle '_Bool'
 
286
  else if (_prim_map[CT_PrimDeclSpec::PDS_C_BOOL]) {
 
287
    _prim_map[CT_PrimDeclSpec::PDS_C_BOOL] = 0;
 
288
    type = &CTYPE_C_BOOL;
 
289
  }
282
290
  // handle 'float'
283
291
  else if (_prim_map[CT_PrimDeclSpec::PDS_FLOAT]) {
284
292
    _prim_map[CT_PrimDeclSpec::PDS_FLOAT] = 0;
466
474
  if (_prim_map[CT_PrimDeclSpec::PDS_CHAR] + 
467
475
      _prim_map[CT_PrimDeclSpec::PDS_WCHAR_T] + 
468
476
      _prim_map[CT_PrimDeclSpec::PDS_BOOL] + 
 
477
      _prim_map[CT_PrimDeclSpec::PDS_C_BOOL] + 
469
478
      _prim_map[CT_PrimDeclSpec::PDS_SHORT] + 
470
479
      _prim_map[CT_PrimDeclSpec::PDS_INT] + 
471
480
      _prim_map[CT_PrimDeclSpec::PDS_LONG] +