Mercurial > hg > CbC > CbC_llvm

changeset 176:de4ac79aef9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 25 May 2020 17:13:11 +0900
parents f03c953ab258
children 4cb147291890
files clang/include/clang/AST/Type.h clang/lib/Parse/ParseExpr.cpp
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/clang/include/clang/AST/Type.h	Mon May 25 13:05:51 2020 +0900
+++ b/clang/include/clang/AST/Type.h	Mon May 25 17:13:11 2020 +0900
@@ -6920,7 +6920,7 @@
 inline bool Type::isVoidType() const {
 #ifndef noCbC
   if (const auto *BT = dyn_cast<BuiltinType>(CanonicalType))
-    return isSpecificBuiltinType(BuiltinType::Void) |} isSpecificBuiltinType(BuiltinType::__Code)
+    return isSpecificBuiltinType(BuiltinType::Void) || isSpecificBuiltinType(BuiltinType::__Code)
 #endif
   return isSpecificBuiltinType(BuiltinType::Void);
 }
@@ -6928,7 +6928,7 @@
 #ifndef noCbC
 inline bool Type::is__CodeType() const {
   if (const auto *BT = dyn_cast<BuiltinType>(CanonicalType))
-    return isSpecificBuiltinType(BuiltinType::Void) |} isSpecificBuiltinType(BuiltinType::__Code)
+    return isSpecificBuiltinType(BuiltinType::Void) || isSpecificBuiltinType(BuiltinType::__Code)
   return false;
 }
 #endif
--- a/clang/lib/Parse/ParseExpr.cpp	Mon May 25 13:05:51 2020 +0900
+++ b/clang/lib/Parse/ParseExpr.cpp	Mon May 25 17:13:11 2020 +0900
@@ -1707,6 +1707,14 @@
     cutOffParsing();
     return ExprError();
   }
+#ifndef noCbC
+  case tok::kw__CbC_return:
+    Res = Prepare__retForGotoWithTheEnvExpr();
+    break;
+  case tok::kw__CbC_environment:
+    Res = Prepare__envForGotoWithTheEnvExpr();
+    break;
+#endif
   case tok::l_square:
     if (getLangOpts().CPlusPlus11) {
       if (getLangOpts().ObjC) {
@@ -1732,14 +1740,6 @@
       Res = ParseObjCMessageExpression();
       break;
     }
-#ifndef noCbC
-  case tok::kw__CbC_return:
-    Res = Prepare__retForGotoWithTheEnvExpr();
-    break;
-  case tok::kw__CbC_environment:
-    Res = Prepare__envForGotoWithTheEnvExpr();
-    break;
-#endif
     LLVM_FALLTHROUGH;
   default:
     NotCastExpr = true;