From 504228b1f7b875550eae9e3782a5f2c1033b0233 Mon Sep 17 00:00:00 2001
From: Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr>
Date: Wed, 30 Sep 2015 18:41:50 +0200
Subject: Fixed a few bugs in the pre parser. In particular, the following code
 was not parsed correctly:

typedef int a;

int f() {
  for(int a; ;)
    if(1);
  a * x;
}

Additionnaly, I tried to add some comments in the pre-parser code,
especially for the different hacks used to solve various conflicts.
---
 test/regression/Makefile        |   3 +-
 test/regression/Results/parsing |   0
 test/regression/parsing.c       | 104 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 test/regression/Results/parsing
 create mode 100644 test/regression/parsing.c

(limited to 'test')

diff --git a/test/regression/Makefile b/test/regression/Makefile
index 2f70c63a..6ef44b78 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -17,7 +17,8 @@ TESTS=int32 int64 floats floats-basics \
   volatile1 volatile2 volatile3 \
   funct3 expr5 struct7 struct8 struct11 struct12 casts1 casts2 char1 \
   sizeof1 sizeof2 binops bool for1 switch switch2 compound \
-  decl1 interop1 bitfields9 ptrs3
+  decl1 interop1 bitfields9 ptrs3 \
+  parsing
 
 # Can run, but only in compiled mode, and have reference output in Results
 
diff --git a/test/regression/Results/parsing b/test/regression/Results/parsing
new file mode 100644
index 00000000..e69de29b
diff --git a/test/regression/parsing.c b/test/regression/parsing.c
new file mode 100644
index 00000000..24b954c1
--- /dev/null
+++ b/test/regression/parsing.c
@@ -0,0 +1,104 @@
+#include<stdio.h>
+
+typedef signed int T;
+
+T f(T(T));
+T f(T a(T)) {
+  T b;
+  return 1;
+}
+int g(int x) {
+ T:;
+  T y;
+  T T;
+  T=1;
+
+  return 1;
+}
+
+void h() {
+  for(int T; ;)
+    if(1)
+      ;
+  T *x;
+  x = 0;
+}
+
+void h2() {
+  for(int T; ;)
+    if(1)
+      ;
+    else T;
+}
+
+struct S {
+  const T:3;
+  unsigned T:3;
+  const T:3;
+};
+
+void i() {
+  struct S s;
+  s.T = -1;
+  if(s.T < 0) printf("ERROR i\n");
+}
+
+/* These ones are parsed correctly, but rejected by the elaborator. */
+/* void j() { */
+/*   typedef int I; */
+/*   {sizeof(enum{I=2}); return I;} */
+/*   {do sizeof(enum{I=2}); while((I)1);} */
+/*   {if(1) return sizeof(enum{I=2}); */
+/*    else  return (I)1;} */
+/*   {if(sizeof(enum{I=2})) return I; */
+/*    else return I;} */
+/*   {sizeof(enum{I=2})+I;} */
+/*   {for(int i = sizeof(enum{I=2}); I; I) I; (I)1;} */
+/* } */
+/* int f2(enum{I=2} x) { */
+/*   return I; */
+/* } */
+/* void k(A, B) */
+/*      int B; */
+/*      int A[B]; */
+/* { } */
+/* int l(A) */
+/*      enum {T=1} A; */
+/* { return T * A; } */
+
+void m() {
+  if(0)
+    if(1);
+    else printf("ERROR m\n");
+  if(0)
+    for(int i; ; )
+      if(1);
+      else printf("ERROR m\n");
+  if(0)
+    for(1; ; )
+      if(1);
+      else printf("ERROR m\n");
+  if(0)
+    while(1)
+      if(1);
+      else printf("ERROR m\n");
+  if(0)
+  L: if(1);
+     else printf("ERROR m\n");
+
+  if(0)
+  LL:for(1;;)
+      for(int i;;)
+        while(1)
+          switch(1)
+          case 1:
+            if(1);
+            else printf("ERROR m\n");
+}
+
+int main () {
+  f(g);
+  i();
+  m();
+  return 0;
+}
-- 
cgit