src/compiler/Parser.cpp
changeset 238 e9bec7549c28
parent 234 26e3035cdffc
child 241 18f3010a358c
     1.1 --- a/src/compiler/Parser.cpp	Mon Dec 24 16:43:22 2012 -0800
     1.2 +++ b/src/compiler/Parser.cpp	Tue Dec 25 16:32:06 2012 -0800
     1.3 @@ -804,7 +804,7 @@
     1.4      Statement *decl = NULL;
     1.5      if (!match(TOK_SEMICOLON)) {
     1.6          if (match(TOK_NEW)) {
     1.7 -            if ((decl = vars(Qual_None)) == NULL)
     1.8 +            if ((decl = vars(TypeQual_None)) == NULL)
     1.9                  return NULL;
    1.10          } else {
    1.11              if ((decl = expressionStatement()) == NULL)
    1.12 @@ -1044,8 +1044,8 @@
    1.13        case TOK_NEW:
    1.14        {
    1.15          TypeQualifiers quals = (kind == TOK_CONST)
    1.16 -                              ? Qual_Const
    1.17 -                              : Qual_None;
    1.18 +                              ? TypeQual_UnkConst
    1.19 +                              : TypeQual_None;
    1.20          scanner_.scan();
    1.21          if ((statement = vars(quals)) == NULL)
    1.22            return NULL;
    1.23 @@ -1412,8 +1412,7 @@
    1.24              if (kind != TOK_LABEL)
    1.25                  scanner_.scan();
    1.26              if (kind == TOK_PUBLIC && peek(TOK_CONST)) {
    1.27 -                TypeQualifiers quals = TypeQualifiers(Qual_Public | Qual_Const);
    1.28 -                if ((statement = var(quals)) == NULL)
    1.29 +                if ((statement = var(TypeQual_UnkConst)) == NULL)
    1.30                      return NULL;
    1.31                  if (!matchSemicolon())
    1.32                      return NULL;
    1.33 @@ -1429,7 +1428,7 @@
    1.34            case TOK_CONST:
    1.35            case TOK_NEW:
    1.36            {
    1.37 -            TypeQualifiers quals = (kind == TOK_NEW) ? Qual_Const : Qual_None;
    1.38 +            TypeQualifiers quals = (kind == TOK_NEW) ? TypeQual_UnkConst : TypeQual_None;
    1.39              // Note: at global scope, we don't accept comma-delimited
    1.40              // declarations yet, to see if we can get away with forcing
    1.41              // a nicer top-level style.