[dotgnu-pnet-commits] cscctest ChangeLog csharp/class/Makefile.am csh...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    cscctest
Changes by:     Klaus Treichel <ktreichel>      07/10/30 17:50:52

Modified files:
        .              : ChangeLog 
        csharp/class   : Makefile.am member_access1.il member_access1.jl 
                         property5.err property5.jerr 
Added files:
        csharp/class   : access1.cs access1.il access1.jl access2.cs 
                         access2.err access2.jerr property5.il 
                         property5.jl 

Log message:
        Add some tests for class inheritance and update files to reflect 
compiler
        changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cscctest/ChangeLog?cvsroot=dotgnu-pnet&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/Makefile.am?cvsroot=dotgnu-pnet&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/member_access1.il?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/member_access1.jl?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/property5.err?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/property5.jerr?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access1.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access1.il?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access1.jl?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access2.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access2.err?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/access2.jerr?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/property5.il?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/class/property5.jl?cvsroot=dotgnu-pnet&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- ChangeLog   29 Oct 2007 13:07:52 -0000      1.175
+++ ChangeLog   30 Oct 2007 17:50:51 -0000      1.176
@@ -1,3 +1,20 @@
+2007-10-30  Klaus Treichel  <address@hidden>
+
+       * csharp/class/access1.cs, csharp/class/access1.il,
+       csharp/class/access1.jl, csharp/class/access2.cs, 
csharp/class/access2.err,
+       csharp/class/access2.jerr: Add some tests for class inheritance.
+
+       * csharp/class/Makefile.am: Add the new tests above to be executed.
+
+       * csharp/class/member_access1.il, csharp/class/member_access1.jl:
+       update files to reflect the latest compiler changes.
+
+       * csharp/class/property5.il, csharp/class/property5.jl: Add the new
+       test results.
+
+       * csharp/class/property5.err, csharp/class/property5.jerr: Update files
+       to reflect the compiler changes.
+
 2007-10-29  Klaus Treichel  <address@hidden>
 
        * csharp/class/interface3.cs: Fix test by adding an using System;

Index: csharp/class/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/class/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- csharp/class/Makefile.am    22 Sep 2007 13:25:18 -0000      1.37
+++ csharp/class/Makefile.am    30 Oct 2007 17:50:51 -0000      1.38
@@ -1,6 +1,8 @@
 SUBDIRS = generics
 
 TESTS = abstract1.cs \
+               access1.cs \
+               access2.cs \
                ainit1.cs \
                const1.cs \
                const2.cs \

Index: csharp/class/member_access1.il
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/class/member_access1.il,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- csharp/class/member_access1.il      8 Dec 2002 02:52:39 -0000       1.1
+++ csharp/class/member_access1.il      30 Oct 2007 17:50:51 -0000      1.2
@@ -1,3 +1,7 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
 .assembly '<Assembly>'
 {
        .ver 0:0:0:0

Index: csharp/class/member_access1.jl
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/class/member_access1.jl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- csharp/class/member_access1.jl      8 Dec 2002 02:52:39 -0000       1.1
+++ csharp/class/member_access1.jl      30 Oct 2007 17:50:51 -0000      1.2
@@ -1,3 +1,7 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
 .assembly '<Assembly>'
 {
        .ver 0:0:0:0

Index: csharp/class/property5.err
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/class/property5.err,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- csharp/class/property5.err  23 Mar 2002 00:31:10 -0000      1.2
+++ csharp/class/property5.err  30 Oct 2007 17:50:51 -0000      1.3
@@ -1 +1 @@
-./property5.cs:36: declaration of `x' overrides an inherited member, and 
`override' was not present
+./property5.cs:36: warning: declaration of `x' hides an inherited member, and 
`new' was not present

Index: csharp/class/property5.jerr
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/class/property5.jerr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- csharp/class/property5.jerr 23 Mar 2002 00:31:10 -0000      1.2
+++ csharp/class/property5.jerr 30 Oct 2007 17:50:52 -0000      1.3
@@ -1 +1 @@
-./property5.cs:36: declaration of `x' overrides an inherited member, and 
`override' was not present
+./property5.cs:36: warning: declaration of `x' hides an inherited member, and 
`new' was not present

Index: csharp/class/access1.cs
===================================================================
RCS file: csharp/class/access1.cs
diff -N csharp/class/access1.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access1.cs     30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,44 @@
+/*
+ * access1.cs - Test valid class inheritance.
+ *
+ * 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 TestNS
+{
+       public class TestAccess
+       {
+               public class PublicTest
+               {
+               }
+
+               internal protected class ProtectedTest
+               {
+               }
+       }
+
+       public class Test
+       {
+               public class TestPublic : TestAccess.PublicTest
+               {
+               }
+
+               public class TestProtected : TestAccess.ProtectedTest
+               {
+               }
+       }
+}
\ No newline at end of file

Index: csharp/class/access1.il
===================================================================
RCS file: csharp/class/access1.il
diff -N csharp/class/access1.il
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access1.il     30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,75 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.namespace 'TestNS'
+{
+.class public auto ansi 'TestAccess' extends ['.library']'System'.'Object'
+{
+.class nested public auto ansi 'PublicTest' 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 PublicTest
+.class nested famorassem auto ansi 'ProtectedTest' 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 ProtectedTest
+.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 TestAccess
+} // namespace TestNS
+.namespace 'TestNS'
+{
+.class public auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.class nested public auto ansi 'TestPublic' extends 
'TestNS'.'TestAccess'/'PublicTest'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void 'TestNS'.'TestAccess'/'PublicTest'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class TestPublic
+.class nested public auto ansi 'TestProtected' extends 
'TestNS'.'TestAccess'/'ProtectedTest'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void 'TestNS'.'TestAccess'/'ProtectedTest'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class TestProtected
+.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 Test
+} // namespace TestNS

Index: csharp/class/access1.jl
===================================================================
RCS file: csharp/class/access1.jl
diff -N csharp/class/access1.jl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access1.jl     30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,81 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.namespace 'TestNS'
+{
+.class public auto ansi 'TestAccess' extends ['.library']'System'.'Object'
+{
+.class nested public auto ansi 'PublicTest' 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 PublicTest
+.class nested famorassem auto ansi 'ProtectedTest' 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 ProtectedTest
+.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 TestAccess
+} // namespace TestNS
+.namespace 'TestNS'
+{
+.class public auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.class nested public auto ansi 'TestPublic' extends 
'TestNS'.'TestAccess'/'PublicTest'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed java 
+{
+       aload_0
+       invokespecial   instance void 
'TestNS'.'TestAccess'/'PublicTest'::'.ctor'()
+       return
+       .locals 1
+       .maxstack 1
+} // method .ctor
+} // class TestPublic
+.class nested public auto ansi 'TestProtected' extends 
'TestNS'.'TestAccess'/'ProtectedTest'
+{
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed java 
+{
+       aload_0
+       invokespecial   instance void 
'TestNS'.'TestAccess'/'ProtectedTest'::'.ctor'()
+       return
+       .locals 1
+       .maxstack 1
+} // method .ctor
+} // class TestProtected
+.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 Test
+} // namespace TestNS

Index: csharp/class/access2.cs
===================================================================
RCS file: csharp/class/access2.cs
diff -N csharp/class/access2.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access2.cs     30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,44 @@
+/*
+ * access2.cs - Test invalid class inheritance.
+ *
+ * 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 TestNS
+{
+       public class TestAccess
+       {
+               private class PrivateTest
+               {
+               }
+
+               protected class ProtectedTest
+               {
+               }
+       }
+
+       public class Test
+       {
+               public class TestPrivate : TestAccess.PrivateTest
+               {
+               }
+
+               public class TestProtected : TestAccess.ProtectedTest
+               {
+               }
+       }
+}

Index: csharp/class/access2.err
===================================================================
RCS file: csharp/class/access2.err
diff -N csharp/class/access2.err
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access2.err    30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,6 @@
+./access2.cs:37: `PrivateTest' is not a member of the type `TestNS.TestAccess'
+./access2.cs:37: invalid base type
+./access2.cs:37: `PrivateTest' is not a member of the type `TestNS.TestAccess'
+./access2.cs:37: invalid base type
+./access2.cs:43: no accessible base class constructors
+./access2.cs:44: called object is not a method or delegate

Index: csharp/class/access2.jerr
===================================================================
RCS file: csharp/class/access2.jerr
diff -N csharp/class/access2.jerr
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/access2.jerr   30 Oct 2007 17:50:51 -0000      1.1
@@ -0,0 +1,6 @@
+./access2.cs:37: `PrivateTest' is not a member of the type `TestNS.TestAccess'
+./access2.cs:37: invalid base type
+./access2.cs:37: `PrivateTest' is not a member of the type `TestNS.TestAccess'
+./access2.cs:37: invalid base type
+./access2.cs:43: no accessible base class constructors
+./access2.cs:44: called object is not a method or delegate

Index: csharp/class/property5.il
===================================================================
RCS file: csharp/class/property5.il
diff -N csharp/class/property5.il
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/property5.il   30 Oct 2007 17:50:52 -0000      1.1
@@ -0,0 +1,61 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.class private auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.method public virtual hidebysig newslot specialname instance int32 'get_x'() 
cil managed 
+{
+       ldc.i4.0
+       ret
+       .maxstack 1
+} // method get_x
+.method public virtual hidebysig newslot specialname instance void 
'set_x'(int32 'value') cil managed 
+{
+       ret
+       .maxstack 0
+} // method set_x
+.property int32 'x'()
+{
+       .get instance int32 'Test'::'get_x'()
+       .set instance void 'Test'::'set_x'(int32)
+} // property x
+.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 Test
+.class private auto ansi 'Test2' extends 'Test'
+{
+.method public hidebysig newslot specialname instance int32 'get_x'() cil 
managed 
+{
+       ldc.i4.0
+       ret
+       .maxstack 1
+} // method get_x
+.method public hidebysig newslot specialname instance void 'set_x'(int32 
'value') cil managed 
+{
+       ret
+       .maxstack 0
+} // method set_x
+.property int32 'x'()
+{
+       .get instance int32 'Test2'::'get_x'()
+       .set instance void 'Test2'::'set_x'(int32)
+} // property x
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed 
+{
+       ldarg.0
+       call    instance void 'Test'::'.ctor'()
+       ret
+       .maxstack 1
+} // method .ctor
+} // class Test2

Index: csharp/class/property5.jl
===================================================================
RCS file: csharp/class/property5.jl
diff -N csharp/class/property5.jl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/class/property5.jl   30 Oct 2007 17:50:52 -0000      1.1
@@ -0,0 +1,67 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.class private auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.method public virtual hidebysig newslot specialname instance int32 'get_x'() 
cil managed java 
+{
+       iconst_0
+       ireturn
+       .locals 1
+       .maxstack 1
+} // method get_x
+.method public virtual hidebysig newslot specialname instance void 
'set_x'(int32 'value') cil managed java 
+{
+       return
+       .locals 2
+       .maxstack 0
+} // method set_x
+.property int32 'x'()
+{
+       .get instance int32 'Test'::'get_x'()
+       .set instance void 'Test'::'set_x'(int32)
+} // property x
+.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 Test
+.class private auto ansi 'Test2' extends 'Test'
+{
+.method public hidebysig newslot specialname instance int32 'get_x'() cil 
managed java 
+{
+       iconst_0
+       ireturn
+       .locals 1
+       .maxstack 1
+} // method get_x
+.method public hidebysig newslot specialname instance void 'set_x'(int32 
'value') cil managed java 
+{
+       return
+       .locals 2
+       .maxstack 0
+} // method set_x
+.property int32 'x'()
+{
+       .get instance int32 'Test2'::'get_x'()
+       .set instance void 'Test2'::'set_x'(int32)
+} // property x
+.method public hidebysig specialname rtspecialname instance void '.ctor'() cil 
managed java 
+{
+       aload_0
+       invokespecial   instance void 'Test'::'.ctor'()
+       return
+       .locals 1
+       .maxstack 1
+} // method .ctor
+} // class Test2