[dotgnu-pnet-commits] cscctest ChangeLog csharp/expr/newarray1.il csh...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    cscctest
Changes by:     Klaus Treichel <ktreichel>      07/10/14 20:14:02

Modified files:
        .              : ChangeLog 
        csharp/expr    : newarray1.il newarray1.jl 
        csharp/stmt    : Makefile.am 
Added files:
        csharp/stmt    : using_statement1.cs using_statement1.il 
                         using_statement1.jl 

Log message:
        Adjist the results for the newarray1 test to match the recent compiler 
change.
        Add simple testcase for the using_statement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cscctest/ChangeLog?cvsroot=dotgnu-pnet&r1=1.171&r2=1.172
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/expr/newarray1.il?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/expr/newarray1.jl?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/Makefile.am?cvsroot=dotgnu-pnet&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_statement1.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_statement1.il?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cscctest/csharp/stmt/using_statement1.jl?cvsroot=dotgnu-pnet&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- ChangeLog   23 Sep 2007 09:23:44 -0000      1.171
+++ ChangeLog   14 Oct 2007 20:14:01 -0000      1.172
@@ -1,3 +1,14 @@
+2007-10-14  Klaus Treichel  <address@hidden>
+
+       * csharp/expr/newarray1.il, csharp/expr/newarray1.jl: Update files
+       to match the recent compiler change.
+
+       * csharp/stmt/Makefile.am: Add the testcase using_statement1.cs
+
+       * csharp/stmt/using_statement1.cs, csharp/stmt/using_statement1.il,
+       csharp/stmt/using_statement1.jl: Add first simple testcase for the
+       using statement.
+
 2007-09-23  Klaus Treichel  <address@hidden>
 
        * csharp/class/generics/Makefile.am: Add class3.cs to the tests to be

Index: csharp/expr/newarray1.il
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/expr/newarray1.il,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- csharp/expr/newarray1.il    21 Dec 2002 14:02:40 -0000      1.3
+++ csharp/expr/newarray1.il    14 Oct 2007 20:14:01 -0000      1.4
@@ -30,7 +30,7 @@
 {
 .method private hidebysig instance void 'm1'(int32 'dim', unsigned int32 
'dim2', int64 'dim3', unsigned int64 'dim4') cil managed 
 {
-       .locals init    (int32[], valuetype 'X'[], valuetype 'Color'[,], class 
'Test'[], class 'Test'[][], class ['.library']'System'.'Object'[,,], class 
['.library']'System'.'Object'[,,][][,,,], class 
['.library']'System'.'Object'[,])
+       .locals init    (int32[], valuetype 'X'[], valuetype 'Color'[,], class 
'Test'[], class 'Test'[][], class ['.library']'System'.'Object'[,,], class 
['.library']'System'.'Object'[,,,][][,,], class 
['.library']'System'.'Object'[,])
        ldc.i4.3
        newarr  ['.library']'System'.'Int32'
        stloc.0
@@ -55,7 +55,7 @@
        ldarg.1
        ldarg.1
        ldarg.1
-       newobj  instance void class 
['.library']'System'.'Object'[,,][][,,,]::.ctor(int32, int32, int32)
+       newobj  instance void class 
['.library']'System'.'Object'[,,,][][,,]::.ctor(int32, int32, int32, int32)
        stloc.s 6
        ldarg.2
        newarr  ['.library']'System'.'Int32'

Index: csharp/expr/newarray1.jl
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/expr/newarray1.jl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- csharp/expr/newarray1.jl    21 Nov 2002 00:06:54 -0000      1.2
+++ csharp/expr/newarray1.jl    14 Oct 2007 20:14:01 -0000      1.3
@@ -55,7 +55,7 @@
        iload_1
        iload_1
        iload_1
-       multianewarray  class ['.library']'System'.'Object'[,,][][,,,] 3
+       multianewarray  class ['.library']'System'.'Object'[,,,][][,,] 3
        astore  13
        iload_2
        newarray int32

Index: csharp/stmt/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/cscctest/csharp/stmt/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- csharp/stmt/Makefile.am     30 May 2007 06:26:07 -0000      1.17
+++ csharp/stmt/Makefile.am     14 Oct 2007 20:14:01 -0000      1.18
@@ -30,6 +30,7 @@
                using_namespace4.cs \
                using_namespace5.cs \
                using_namespace6.cs \
+               using_statement1.cs \
                using1.cs \
                using2.cs \
                using3.cs \

Index: csharp/stmt/using_statement1.cs
===================================================================
RCS file: csharp/stmt/using_statement1.cs
diff -N csharp/stmt/using_statement1.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_statement1.cs     14 Oct 2007 20:14:02 -0000      1.1
@@ -0,0 +1,48 @@
+/*
+ * using_statement1.cs - Test the using statement - valid cases.
+ *
+ * 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 System;
+
+public class Test
+{
+
+       private class TestDisposable : IDisposable
+       {
+               void Dispose()
+               {
+               }
+       }
+
+       static void Test1()
+       {
+               TestDisposable a = new TestDisposable();
+
+               using(a)
+               {
+               }
+       }
+
+       static void Test2()
+       {
+               using(TestDisposable a = new TestDisposable())
+               {
+               }
+       }
+}

Index: csharp/stmt/using_statement1.il
===================================================================
RCS file: csharp/stmt/using_statement1.il
diff -N csharp/stmt/using_statement1.il
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_statement1.il     14 Oct 2007 20:14:02 -0000      1.1
@@ -0,0 +1,75 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.class public auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.class nested private auto ansi 'TestDisposable' extends 
['.library']'System'.'Object' implements ['.library']'System'.'IDisposable'
+{
+.method private hidebysig instance void 'Dispose'() cil managed 
+{
+       ret
+       .maxstack 0
+} // method Dispose
+.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 TestDisposable
+.method private static hidebysig void 'Test1'() cil managed 
+{
+       .locals init    (class 'Test'/'TestDisposable')
+       newobj  instance void 'Test'/'TestDisposable'::'.ctor'()
+       stloc.0
+       .locals init    (class ['.library']'System'.'IDisposable')
+       ldloc.0
+       stloc.1
+       .try {
+       leave   ?L1
+       } finally {
+       ldloc.1
+       brfalse ?L2
+       ldloc.1
+       callvirt        instance void [.library]System.IDisposable::Dispose()
+       endfinally
+?L2:
+       }
+?L1:
+       ret
+       .maxstack 1
+} // method Test1
+.method private static hidebysig void 'Test2'() cil managed 
+{
+       .locals init    (class 'Test'/'TestDisposable')
+       newobj  instance void 'Test'/'TestDisposable'::'.ctor'()
+       stloc.0
+       .try {
+       leave   ?L3
+       } finally {
+       ldloc.0
+       brfalse ?L4
+       ldloc.0
+       callvirt        instance void [.library]System.IDisposable::Dispose()
+       endfinally
+?L4:
+       }
+?L3:
+       ret
+       .maxstack 1
+} // method Test2
+.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

Index: csharp/stmt/using_statement1.jl
===================================================================
RCS file: csharp/stmt/using_statement1.jl
diff -N csharp/stmt/using_statement1.jl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ csharp/stmt/using_statement1.jl     14 Oct 2007 20:14:02 -0000      1.1
@@ -0,0 +1,53 @@
+.assembly extern '.library'
+{
+       .ver 0:0:0:0
+}
+.assembly '<Assembly>'
+{
+       .ver 0:0:0:0
+}
+.module '<Module>'
+.class public auto ansi 'Test' extends ['.library']'System'.'Object'
+{
+.class nested private auto ansi 'TestDisposable' extends 
['.library']'System'.'Object' implements ['.library']'System'.'IDisposable'
+{
+.method private hidebysig instance void 'Dispose'() cil managed java 
+{
+       return
+       .locals 1
+       .maxstack 0
+} // method Dispose
+.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 TestDisposable
+.method private static hidebysig void 'Test1'() cil managed java 
+{
+       new     'Test'/'TestDisposable'
+       dup
+       invokespecial   instance void 'Test'/'TestDisposable'::'.ctor'()
+       astore_0
+       return
+       .locals 1
+       .maxstack 2
+} // method Test1
+.method private static hidebysig void 'Test2'() cil managed java 
+{
+       return
+       .locals 1
+       .maxstack 0
+} // method Test2
+.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