dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_gather.c,1.29,1.30 cs_gr


From: Gopal.V <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/cscc/csharp cs_gather.c,1.29,1.30 cs_grammar.y,1.40,1.41 cs_lvalue.tc,1.33,1.34 cs_types.tc,1.5,1.6 cs_defs.tc,1.6,1.7
Date: Sat, 07 Dec 2002 20:59:29 -0500

Update of /cvsroot/dotgnu-pnet/pnet/cscc/csharp
In directory subversions:/tmp/cvs-serv12718/cscc/csharp

Modified Files:
        cs_gather.c cs_grammar.y cs_lvalue.tc cs_types.tc cs_defs.tc 
Log Message:
fix for bug 1900


Index: cs_gather.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_gather.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** cs_gather.c 21 Nov 2002 05:25:38 -0000      1.29
--- cs_gather.c 8 Dec 2002 01:59:27 -0000       1.30
***************
*** 1932,1936 ****
        tree = (ILNode *)list;
        list = (ILNode_List *)ILNode_List_create();
!       systemObject = ILQualIdentTwo("System", "Object");
        ILNode_ListIter_Init(&iterator, tree);
        while((child = ILNode_ListIter_Next(&iterator)) != 0)
--- 1932,1936 ----
        tree = (ILNode *)list;
        list = (ILNode_List *)ILNode_List_create();
!       systemObject = ILNode_SystemType_create("Object");
        ILNode_ListIter_Init(&iterator, tree);
        while((child = ILNode_ListIter_Next(&iterator)) != 0)

Index: cs_grammar.y
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_grammar.y,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** cs_grammar.y        4 Dec 2002 18:30:08 -0000       1.40
--- cs_grammar.y        8 Dec 2002 01:59:27 -0000       1.41
***************
*** 206,210 ****
   */
  #define       MakeSystemType(name)    \
!                       (ILNode_GlobalNamespace_create(ILQualIdentTwo("System", 
#name)))
  
  /*
--- 206,210 ----
   */
  #define       MakeSystemType(name)    \
!                       
(ILNode_GlobalNamespace_create(ILNode_SystemType_create(name)))
  
  /*
***************
*** 1311,1317 ****
        | DOUBLE                { MakeUnary(PrimitiveType, 
IL_META_ELEMTYPE_R8); }
        | LONG_DOUBLE   { MakeUnary(PrimitiveType, IL_META_ELEMTYPE_R); }
!       | DECIMAL               { MakeSimple(DecimalType); }
!       | OBJECT                { MakeSimple(ObjectType); }
!       | STRING                { MakeSimple(StringType); }
        ;
  
--- 1311,1317 ----
        | DOUBLE                { MakeUnary(PrimitiveType, 
IL_META_ELEMTYPE_R8); }
        | LONG_DOUBLE   { MakeUnary(PrimitiveType, IL_META_ELEMTYPE_R); }
!       | DECIMAL               { MakeUnary(SystemType,"Decimal"); }
!       | OBJECT                { MakeUnary(SystemType,"Object"); }
!       | STRING                { MakeUnary(SystemType,"String"); }
        ;
  
***************
*** 3313,3317 ****
  
                                /* Make sure that we have "ValueType" in the 
base list */
!                               baseList = MakeSystemType(ValueType);
                                if($5 != 0)
                                {
--- 3313,3317 ----
  
                                /* Make sure that we have "ValueType" in the 
base list */
!                               baseList = MakeSystemType("ValueType");
                                if($5 != 0)
                                {
***************
*** 3573,3577 ****
  
                                /* Make sure that we have "Enum" in the base 
list */
!                               baseList = MakeSystemType(Enum);
  
                                /* Add an instance field called "value__" to 
the body,
--- 3573,3577 ----
  
                                /* Make sure that we have "Enum" in the base 
list */
!                               baseList = MakeSystemType("Enum");
  
                                /* Add an instance field called "value__" to 
the body,
***************
*** 3687,3691 ****
                                /* Make sure that we have "MulticastDelegate"
                                   in the base list */
!                               baseList = MakeSystemType(MulticastDelegate);
  
                                /* Construct the body of the delegate class */
--- 3687,3691 ----
                                /* Make sure that we have "MulticastDelegate"
                                   in the base list */
!                               baseList = MakeSystemType("MulticastDelegate");
  
                                /* Construct the body of the delegate class */

Index: cs_lvalue.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_lvalue.tc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** cs_lvalue.tc        6 Dec 2002 08:39:40 -0000       1.33
--- cs_lvalue.tc        8 Dec 2002 01:59:27 -0000       1.34
***************
*** 1085,1088 ****
--- 1085,1089 ----
  
        /*  Manufacture a Semantic value for the "namespace"  */
+       /*
        CSSemSetKind(nsvalue, 
                                        CS_SEMKIND_NAMESPACE, 
ILMemberAccessName(node->expr1));
***************
*** 1094,1098 ****
                                                name, node->expr1, &value);
        }
! 
        /*  PART IV - Punt.  */
        if (!yyisa(*parent,ILNode_MemberAccess))
--- 1095,1099 ----
                                                name, node->expr1, &value);
        }
! */
        /*  PART IV - Punt.  */
        if (!yyisa(*parent,ILNode_MemberAccess))

Index: cs_types.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_types.tc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cs_types.tc 9 Nov 2002 21:24:13 -0000       1.5
--- cs_types.tc 8 Dec 2002 01:59:27 -0000       1.6
***************
*** 152,187 ****
   * Perform semantic analysis for the "object" type.
   */
! ILNode_SemAnalysis(ILNode_ObjectType)
  {
        CSSemValue value;
!       CSSemSetType(value, ILFindSystemType(info, "Object"));
!       if(!(CSSemGetType(value)))
        {
!               CCOutOfMemory();
        }
!       return value;
! }
! 
! /*
!  * Perform semantic analysis for the "string" type.
!  */
! ILNode_SemAnalysis(ILNode_StringType)
! {
!       CSSemValue value;
!       CSSemSetType(value, ILFindSystemType(info, "String"));
!       if(!(CSSemGetType(value)))
        {
!               CCOutOfMemory();
        }
-       return value;
- }
- 
- /*
-  * Perform semantic analysis for the "decimal" type.
-  */
- ILNode_SemAnalysis(ILNode_DecimalType)
- {
-       CSSemValue value;
-       CSSemSetType(value, ILFindSystemType(info, "Decimal"));
        if(!(CSSemGetType(value)))
        {
--- 152,167 ----
   * Perform semantic analysis for the "object" type.
   */
! ILNode_SemAnalysis(ILNode_SystemType)
  {
        CSSemValue value;
!       if(info->noStdlibFlag || info->builtinLibFlag)
        {
!               value=ILNode_SemAnalysis(
!                               
ILQualIdentTwo("System",node->className),info,parent);
        }
!       else
        {
!               CSSemSetType(value, ILFindSystemType(info, node->className));
        }
        if(!(CSSemGetType(value)))
        {

Index: cs_defs.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_defs.tc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** cs_defs.tc  15 Nov 2002 20:26:27 -0000      1.6
--- cs_defs.tc  8 Dec 2002 01:59:27 -0000       1.7
***************
*** 75,81 ****
        ILUInt32 elementType;
  }
! %node ILNode_ObjectType ILNode_Dummy
! %node ILNode_StringType ILNode_Dummy
! %node ILNode_DecimalType ILNode_Dummy
  %node ILNode_TypeSuffix ILNode_Dummy =
  {
--- 75,82 ----
        ILUInt32 elementType;
  }
! %node ILNode_SystemType ILNode_Dummy =
! {
!       char* className;
! }
  %node ILNode_TypeSuffix ILNode_Dummy =
  {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]