[dotgnu-pnet-commits] cscctest ChangeLog csharp/stmt/Makefile.am csha...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    cscctest
Changes by:     Klaus Treichel <ktreichel>      07/05/29 15:16:47

Modified files:
        .              : ChangeLog 
        csharp/stmt    : Makefile.am 
Added files:
        csharp/stmt    : using_alias1.cs using_alias1.il using_alias1.jl 
                         using_alias2.cs using_alias2.il using_alias3.cs 
                         using_alias3.err using_alias3.jerr 
                         using_alias4.cs using_alias4.err 
                         using_alias4.jerr using_alias5.cs 
                         using_alias5.err using_alias5.jerr 

Log message:
        Add new testcases for the using alias directive from ECMA 334 Version 4.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cscctest/ChangeLog?cvsroot=dotgnu-pnet&r1=1.165&r2=1.166
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/Makefile.am?cvsroot=dotgnu-pnet&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias1.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias1.il?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias1.jl?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias2.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias2.il?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias3.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias3.err?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias3.jerr?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias4.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias4.err?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias4.jerr?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias5.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias5.err?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_alias5.jerr?cvsroot=dotgnu-pnet&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- ChangeLog   29 May 2007 08:38:50 -0000      1.165
+++ ChangeLog   29 May 2007 15:16:45 -0000      1.166
@@ -13,9 +13,22 @@
        csharp/expr/is1.cs, csharp/expr/new1.cs, csharp/expr/newarray1.cs,
        csharp/expr/typedref1.cs: Fix the tests by including a using System.
 
-       * csharp/expr/pointeril: Remove the unknown flags because they are 
filtered
+       * csharp/expr/pointer.il: Remove the unknown flags because they are 
filtered
        now.
 
+       * csharp/stmt/Makefile.am: Add the new testcases for the using alias
+       directive.
+
+       * csharp/stmt/using_alias1.cs, csharp/stmt/using_alias1.il,
+       csharp/stmt/using_alias1.jl, csharp/stmt/using_alias2.cs,
+       csharp/stmt/using_alias2.il, csharp/stmt/using_alias2.il,
+       csharp/stmt/using_alias3.cs, csharp/stmt/using_alias3.err,
+       csharp/stmt/using_alias3.jerr, csharp/stmt/using_alias4.cs,
+       csharp/stmt/using_alias4.err, csharp/stmt/using_alias4.jerr,
+       csharp/stmt/using_alias5.cs, csharp/stmt/using_alias5.err,
+       csharp/stmt/using_alias5.jerr: Add new testscases for the using alias
+       directive.
+
 2003-10-13  Rhys Weatherley  <address@hidden>
 
        * csharp/stmt/Makefile.am, csharp/stmt/foreach6.cs,

Index: csharp/stmt/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/stmt/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- csharp/stmt/Makefile.am     14 Oct 2003 05:29:12 -0000      1.15
+++ csharp/stmt/Makefile.am     29 May 2007 15:16:46 -0000      1.16
@@ -19,6 +19,11 @@
                switch3.cs \
                switch4.cs \
                switch5.cs \
+               using_alias1.cs \
+               using_alias2.cs \
+               using_alias3.cs \
+               using_alias4.cs \
+               using_alias5.cs \
                using1.cs \
                using2.cs \
                using3.cs \

Index: csharp/stmt/using_alias1.cs
===================================================================
RCS file: csharp/stmt/using_alias1.cs
diff -N csharp/stmt/using_alias1.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias1.cs 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,31 @@
+/*
+ * using_alias1.cs - Test scoping of using aliases - ECMA 334 V4 16.4.1.
+ *
+ * Copyright (C) 2007  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+namespace N1.N2
+{
+       class A {}
+}
+
+namespace N3
+{
+       using A = N1.N2.A;
+
+       class B: A {}
+}

Index: csharp/stmt/using_alias1.il
===================================================================
RCS file: csharp/stmt/using_alias1.il
diff -N csharp/stmt/using_alias1.il
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias1.il 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,35 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.namespace 'N1.N2'
+{
+.class private auto ansi 'A' extends ['.library']'System'.'Object'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void ['.library']'System'.'Object'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class A
+} // namespace N1.N2
+.namespace 'N3'
+{
+.class private auto ansi 'B' extends 'N1.N2'.'A'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void 'N1.N2'.'A'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class B
+} // namespace N3

Index: csharp/stmt/using_alias1.jl
===================================================================
RCS file: csharp/stmt/using_alias1.jl
diff -N csharp/stmt/using_alias1.jl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias1.jl 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,37 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.namespace 'N1.N2'
+{
+.class private auto ansi 'A' extends ['.library']'System'.'Object'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed java 
+{
+       aload_0
+       invokespecial   instance void ['.library']'System'.'Object'::'.ctor'()
+       return
+       .locals 1
+       .maxstack 1
+} // method .ctor
+} // class A
+} // namespace N1.N2
+.namespace 'N3'
+{
+.class private auto ansi 'B' extends 'N1.N2'.'A'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed java 
+{
+       aload_0
+       invokespecial   instance void 'N1.N2'.'A'::'.ctor'()
+       return
+       .locals 1
+       .maxstack 1
+} // method .ctor
+} // class B
+} // namespace N3

Index: csharp/stmt/using_alias2.cs
===================================================================
RCS file: csharp/stmt/using_alias2.cs
diff -N csharp/stmt/using_alias2.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias2.cs 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,31 @@
+/*
+ * using_alias2.cs - Test scoping of using aliases - ECMA 334 V4 16.4.1.
+ *
+ * Copyright (C) 2007  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+namespace N1.N2
+{
+       class A {}
+}
+
+namespace N3
+{
+       using R = N1.N2;
+
+       class B: R.A {}
+}

Index: csharp/stmt/using_alias2.il
===================================================================
RCS file: csharp/stmt/using_alias2.il
diff -N csharp/stmt/using_alias2.il
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias2.il 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,35 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.namespace 'N1.N2'
+{
+.class private auto ansi 'A' extends ['.library']'System'.'Object'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void ['.library']'System'.'Object'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class A
+} // namespace N1.N2
+.namespace 'N3'
+{
+.class private auto ansi 'B' extends 'N1.N2'.'A'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void 'N1.N2'.'A'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class B
+} // namespace N3

Index: csharp/stmt/using_alias3.cs
===================================================================
RCS file: csharp/stmt/using_alias3.cs
diff -N csharp/stmt/using_alias3.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias3.cs 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,39 @@
+/*
+ * using_alias3.cs - Test scoping of using aliases - ECMA 334 V4 16.4.1.
+ *
+ * Copyright (C) 2007  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+namespace N1.N2
+{
+       class B {}
+}
+
+namespace N3
+{
+       class A {}
+       class B : A {}
+}
+
+namespace N3
+{
+       using A = N1.N2;
+       using B = N1.N2.B;
+
+       class W : B {}          // Error: B is ambiguous
+       class X : A.B {}        // Error: A is ambiguous
+}

Index: csharp/stmt/using_alias3.err
===================================================================
RCS file: csharp/stmt/using_alias3.err
diff -N csharp/stmt/using_alias3.err
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias3.err        29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,4 @@
+./using_alias3.cs:37: `B' is defined ambiguously because an alias exists with 
the same name
+./using_alias3.cs:38: `A' is defined ambiguously because an alias exists with 
the same name
+./using_alias3.cs:38: `B' is not a member of the type `N3.A'
+./using_alias3.cs:38: invalid base type

Index: csharp/stmt/using_alias3.jerr
===================================================================
RCS file: csharp/stmt/using_alias3.jerr
diff -N csharp/stmt/using_alias3.jerr
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias3.jerr       29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,4 @@
+./using_alias3.cs:37: `B' is defined ambiguously because an alias exists with 
the same name
+./using_alias3.cs:38: `A' is defined ambiguously because an alias exists with 
the same name
+./using_alias3.cs:38: `B' is not a member of the type `N3.A'
+./using_alias3.cs:38: invalid base type

Index: csharp/stmt/using_alias4.cs
===================================================================
RCS file: csharp/stmt/using_alias4.cs
diff -N csharp/stmt/using_alias4.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias4.cs 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,33 @@
+/*
+ * using_alias4.cs - Test scoping of using aliases - ECMA 334 V4 16.4.1.
+ *
+ * Copyright (C) 2007  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+using R = N1.N2;
+
+namespace N1.N2
+{
+       class B {}
+}
+
+namespace N3
+{
+       class R {}
+       class B : R.A {}        // Error: R has no member A
+}
+

Index: csharp/stmt/using_alias4.err
===================================================================
RCS file: csharp/stmt/using_alias4.err
diff -N csharp/stmt/using_alias4.err
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias4.err        29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,2 @@
+./using_alias4.cs:31: `A' is not a member of the type `N3.R'
+./using_alias4.cs:31: invalid base type

Index: csharp/stmt/using_alias4.jerr
===================================================================
RCS file: csharp/stmt/using_alias4.jerr
diff -N csharp/stmt/using_alias4.jerr
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias4.jerr       29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,2 @@
+./using_alias4.cs:31: `A' is not a member of the type `N3.R'
+./using_alias4.cs:31: invalid base type

Index: csharp/stmt/using_alias5.cs
===================================================================
RCS file: csharp/stmt/using_alias5.cs
diff -N csharp/stmt/using_alias5.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias5.cs 29 May 2007 15:16:46 -0000      1.1
@@ -0,0 +1,36 @@
+/*
+ * using_alias5.cs - Test scoping of using aliases - ECMA 334 V4 16.4.1.
+ *
+ * Copyright (C) 2007  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+using R = N1.N2;
+
+namespace N1.N2
+{
+       class A {}
+}
+
+namespace N3
+{
+       using R2 = N1;
+       using R3 = N1.N2;
+       using R4 = R2.N2;       // Error: R2 unknown
+
+       class B : R4.A {}
+}
+

Index: csharp/stmt/using_alias5.err
===================================================================
RCS file: csharp/stmt/using_alias5.err
diff -N csharp/stmt/using_alias5.err
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias5.err        29 May 2007 15:16:47 -0000      1.1
@@ -0,0 +1,3 @@
+./using_alias5.cs:32: invalid left operand to `.'
+./using_alias5.cs:34: invalid left operand to `.'
+./using_alias5.cs:34: invalid base type

Index: csharp/stmt/using_alias5.jerr
===================================================================
RCS file: csharp/stmt/using_alias5.jerr
diff -N csharp/stmt/using_alias5.jerr
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_alias5.jerr       29 May 2007 15:16:47 -0000      1.1
@@ -0,0 +1,3 @@
+./using_alias5.cs:32: invalid left operand to `.'
+./using_alias5.cs:34: invalid left operand to `.'
+./using_alias5.cs:34: invalid base type