← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aspectc++/vivid

« back to all changes in this revision

Viewing changes to Puma/src/parser/ccparser/instantiation/InstantiationTokenSource.cc

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-05-22 21:12:18 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20120522211218-d62b0xshl9nam2y0
Tags: 1:1.1+svn742-1
http://bugs.debian.org/672013
* New upstream snapshot.
  - fixes compilation with gcc 4.7 (Closes: #672013)
* disable parallelism inside debian/rules (but not submakes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Puma/src/parser/ccparser/instantiation/InstantiationTokenSource.cc
19
19
#include "Puma/InstantiationTokenSource.h"
20
20
#include "Puma/Token.h"
21
21
#include "Puma/CTree.h"
 
22
#include "Puma/DelayedParseTree.h"
22
23
 
23
24
namespace Puma {
24
25
 
27
28
  _root = root;
28
29
  _current = 0;
29
30
  _first = true;
 
31
  _detected_delayed_parse_node = false;
30
32
}
31
33
 
32
34
 
33
 
CTree *InstantiationTokenSource::findToken(CTree* node) const {
 
35
CTree *InstantiationTokenSource::findToken(CTree* node) {
34
36
  if (! node)
35
37
    return 0;
36
 
  if (node->NodeName() == CT_Token::NodeId())
 
38
  const char *node_name = node->NodeName();
 
39
  if (node_name == CT_Token::NodeId())
37
40
    return node;
 
41
  else if (node_name == CT_DelayedParseParamInit::NodeId ()) {
 
42
    _detected_delayed_parse_node = true;
 
43
    return 0;
 
44
  }
38
45
 
39
46
  CTree* token = 0;
40
47
  unsigned sons = node->Sons();