commit, new, &&, ||, lex rep

3 files changed, 214 insertions, 211 deletions

diff --git a/test/lookup1.exp b/test/lookup1.exp
deleted file mode 100644
index 8fc58d76..00000000
--- a/test/lookup1.exp
+++ /dev/null
@@ -1,58 +0,0 @@
-***** NAMSPACES *****
-<root_namespace> {
-  A {
-    B
-  }
-  B {
-    Find
-  }
-  C {
-    D
-    I
-    f
-    g
-    i
-    j
-    find
-  }
-  C
-  C
-  C
-  D
-  E
-  E
-  T
-  Y {
-    Z
-    f
-    t
-  }
-  a
-  b
-  b
-  c
-  c
-  d
-  e
-  f
-  f
-  f
-  i
-  i
-  Int
-  ns1 {
-    sub1 {
-      A
-    }
-    sub2 {
-      B
-    }
-  }
-  ns2 {
-    C
-    i
-  }
-  function
-}
-***** UNKNOWN DECLARATORS *****
-C
diff --git a/test/lookup1.in b/test/lookup1.in
deleted file mode 100644
index 83d51071..00000000
--- a/test/lookup1.in
+++ /dev/null
@@ -1,153 +0,0 @@
-namespace ns1
-{
-	namespace sub1 { class A {}; }
-	namespace sub2 { class B {}; }
-}
-
-namespace ns2
-{
-	int i = b;
-	class C
-	{
-	};
-
-	using namespace ns1;
-}
-
-ns2::sub1::A a;
-
-struct A
-{
-	struct B {};
-};
-
-struct C
-{
-	struct D : virtual public A {};
-};
-
-C::D::A d;
-
-C c;
-
-struct C
-{
-
-};
-
-enum E
-{
-	C,
-	b
-};
-
-E e;
-
-enum E
-{
-	C,
-	b
-};
-
-
-int i;
-class C
-{
-	int j;
-};
-
-class D
-{
-	int ~D();
-};
-
-int C::k;
-int C::~C;
-
-typedef int Int;
-
-class C {};
-void ~C( );
-void C::operator +( int i );
-
-int i;
-
-//void operator C( void k );
-
-class C
-{
-	
-};
-
-int C::f( int i, int j( void v ) );
-class C 
-{
-	class D {};
-
-	typedef C I;
-
-	I::D i;
-};
-
-C c;
-
-void function( int i, int j )
-{
-	function();
-}
-
-
-
-class B { class Find {}; };
-
-typedef B T;
-
-class C : public T
-{
-	Find find;
-};
-
-
-template <class X> struct Y
-{
-	X t;
-	void f();
-};
-
-template <class X> void Y<X>::f();
-template <class X> struct Y
-{
-	class Z {};
-};
-
-class Y<int>
-{
-	int i;
-};
-
-//void f( class C<int> i, int j );
-
-int f( int (*) [](), void );
-void f();
-class C
-{
-	class D {};
-	void g();
-};
-
-//typename C c;
-
-class C
-{
-	class D {};
-	int f();
-};
-
-int f()
-{
-}
-
-int C::f()
-{
-	D d;
-}
diff --git a/test/lookup1.lm b/test/lookup1.lm
index 78aaa853..ad72385d 100644
--- a/test/lookup1.lm
+++ b/test/lookup1.lm
@@ -1,3 +1,4 @@
+##### LM #####
 context lookup
 	#
 	# Data types for global data.
@@ -2201,3 +2202,216 @@ for DI: lookup::declarator_id in S {
 		print( UID '\n' )
 	}
 }
+##### IN #####
+namespace ns1
+{
+	namespace sub1 { class A {}; }
+	namespace sub2 { class B {}; }
+}
+
+namespace ns2
+{
+	int i = b;
+	class C
+	{
+	};
+
+	using namespace ns1;
+}
+
+ns2::sub1::A a;
+
+struct A
+{
+	struct B {};
+};
+
+struct C
+{
+	struct D : virtual public A {};
+};
+
+C::D::A d;
+
+C c;
+
+struct C
+{
+
+};
+
+enum E
+{
+	C,
+	b
+};
+
+E e;
+
+enum E
+{
+	C,
+	b
+};
+
+
+int i;
+class C
+{
+	int j;
+};
+
+class D
+{
+	int ~D();
+};
+
+int C::k;
+int C::~C;
+
+typedef int Int;
+
+class C {};
+void ~C( );
+void C::operator +( int i );
+
+int i;
+
+//void operator C( void k );
+
+class C
+{
+	
+};
+
+int C::f( int i, int j( void v ) );
+class C 
+{
+	class D {};
+
+	typedef C I;
+
+	I::D i;
+};
+
+C c;
+
+void function( int i, int j )
+{
+	function();
+}
+
+
+
+class B { class Find {}; };
+
+typedef B T;
+
+class C : public T
+{
+	Find find;
+};
+
+
+template <class X> struct Y
+{
+	X t;
+	void f();
+};
+
+template <class X> void Y<X>::f();
+template <class X> struct Y
+{
+	class Z {};
+};
+
+class Y<int>
+{
+	int i;
+};
+
+//void f( class C<int> i, int j );
+
+int f( int (*) [](), void );
+void f();
+class C
+{
+	class D {};
+	void g();
+};
+
+//typename C c;
+
+class C
+{
+	class D {};
+	int f();
+};
+
+int f()
+{
+}
+
+int C::f()
+{
+	D d;
+}
+##### EXP #####
+***** NAMSPACES *****
+<root_namespace> {
+  A {
+    B
+  }
+  B {
+    Find
+  }
+  C {
+    D
+    I
+    f
+    g
+    i
+    j
+    find
+  }
+  C
+  C
+  C
+  D
+  E
+  E
+  T
+  Y {
+    Z
+    f
+    t
+  }
+  a
+  b
+  b
+  c
+  c
+  d
+  e
+  f
+  f
+  f
+  i
+  i
+  Int
+  ns1 {
+    sub1 {
+      A
+    }
+    sub2 {
+      B
+    }
+  }
+  ns2 {
+    C
+    i
+  }
+  function
+}
+***** UNKNOWN DECLARATORS *****
+C