[dotgnu-pnet-commits] pnet ChangeLog cscc/csharp/cs_grammar.y

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      08/12/06 19:13:37

Modified files:
        .              : ChangeLog 
        cscc/csharp    : cs_grammar.y 

Log message:
        Fix cast to pointer to pointer type (char **).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3587&r2=1.3588
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/csharp/cs_grammar.y?cvsroot=dotgnu-pnet&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3587
retrieving revision 1.3588
diff -u -b -r1.3587 -r1.3588
--- ChangeLog   26 Nov 2008 20:15:16 -0000      1.3587
+++ ChangeLog   6 Dec 2008 19:13:36 -0000       1.3588
@@ -1,3 +1,7 @@
+2008-12-06  Klaus Treichel  <address@hidden>
+
+       * cscc/csharp/cs_grammar.y; Fix cast to pointer to pointer (char **).
+
 2008-11-26  Klaus Treichel  <address@hidden>
 
        * codegen/cg_decls.tc: Use the new function ILDumpProgramItem for output

Index: cscc/csharp/cs_grammar.y
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_grammar.y,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- cscc/csharp/cs_grammar.y    19 Oct 2008 16:45:18 -0000      1.86
+++ cscc/csharp/cs_grammar.y    6 Dec 2008 19:13:37 -0000       1.87
@@ -1208,7 +1208,7 @@
 %type <node>           PrimaryMemberAccessStart
 %type <node>           PrimaryTypeExpressionPart
 %type <node>           LocalVariableType
-%type <node>           LocalVariableSimplePointerType LocalVariablePointerType
+%type <node>           LocalVariablePointerType
 %type <node>           LocalVariableNonArrayType
 %type <node>           LocalVariableArrayTypeStart
 %type <arrayType>      LocalVariableArrayTypeContinue
@@ -1328,7 +1328,7 @@
 %type <catchinfo>      CatchNameInfo
 %type <target>         AttributeTarget
 
-%expect 21
+%expect 20
 
 %start CompilationUnit
 %%
@@ -1854,18 +1854,13 @@
        ;
 
 /*
- * This one is needed to fix a shift/reduce conflict with the
- * multiplication expression.
+ * Pointer types
  */
-LocalVariableSimplePointerType
-       : PrimaryTypeExpression '*'                     { $$ = $1; }
-       ;
-
 LocalVariablePointerType
        : BuiltinType '*'                                       {
                                MakeUnary(PtrType, $1);
                        }
-       | LocalVariableSimplePointerType        {
+       | PrimaryTypeExpression '*'                     {
                                MakeUnary(PtrType, $1);
                        } 
        | LocalVariableArrayType '*'            {
@@ -2232,10 +2227,10 @@
        | MultiplicativeNonTypeExpression '*' PrefixedUnaryExpression   {
                                MakeBinary(Mul, $1, $3);
                        }
-       | LocalVariableSimplePointerType PrefixedUnaryExpression        {
+       | PrimaryTypeExpression '*' PrefixedUnaryExpression     {
                                /* This one is to pick up the cases where the 
first part is
                                   a PrimaryTypeExpression. */
-                               MakeBinary(Mul, $1, $2);
+                               MakeBinary(Mul, $1, $3);
                        }
        | MultiplicativeExpression '/' PrefixedUnaryExpression  {
                                MakeBinary(Div, $1, $3);