From 425dc1d9f4558282b06b70255110492692372f22 Mon Sep 17 00:00:00 2001 From: Stefano Sanfilippo Date: Thu, 12 Mar 2015 18:59:45 +0100 Subject: [PATCH 1/4] Fixing typo in HEXDIGIT regex. --- src/Monicelli.lpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monicelli.lpp b/src/Monicelli.lpp index 3b46f1f..e29a6bf 100644 --- a/src/Monicelli.lpp +++ b/src/Monicelli.lpp @@ -40,7 +40,7 @@ bool in(const char *sub, const std::string &str) { %option yyclass="Scanner" DIGIT [0-9] -HEXDIGIT [0-9a-zA-Z] +HEXDIGIT [0-9a-fA-F] CHAR [a-zA-Z_] %x shift From aa927e698ba1e497f6b0f6e5ed032e43ca8ab74e Mon Sep 17 00:00:00 2001 From: Stefano Sanfilippo Date: Wed, 25 Mar 2015 01:26:01 +0100 Subject: [PATCH 2/4] Add Netbeans files to gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3aa7803..098b43f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.user /mcc /build +/nbproject From d7fe87ee6e1c55d47abeb7e6f5754ff66e961ae2 Mon Sep 17 00:00:00 2001 From: Stefano Sanfilippo Date: Wed, 25 Mar 2015 01:26:15 +0100 Subject: [PATCH 3/4] Add missing header in BitcodeEmitter.cpp --- src/BitcodeEmitter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BitcodeEmitter.cpp b/src/BitcodeEmitter.cpp index 60c55bb..1eb18c2 100644 --- a/src/BitcodeEmitter.cpp +++ b/src/BitcodeEmitter.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include #include From 3dc5dc604a5bb0a6949f4dbdaf508fc6fe074edc Mon Sep 17 00:00:00 2001 From: Stefano Sanfilippo Date: Wed, 25 Mar 2015 01:28:06 +0100 Subject: [PATCH 4/4] Ensure that a proper bb is created when "else" is omitted in a branch. --- src/BitcodeEmitter.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BitcodeEmitter.cpp b/src/BitcodeEmitter.cpp index 1eb18c2..559a91f 100644 --- a/src/BitcodeEmitter.cpp +++ b/src/BitcodeEmitter.cpp @@ -497,6 +497,8 @@ bool BitcodeEmitter::emit(Branch const& node) { if (body.getElse()) { GUARDED(ensureBasicBlock(*body.getElse(), mergebb)); + } else { + d->builder.CreateBr(mergebb); } func->getBasicBlockList().push_back(mergebb);