Author: rolf
Date: 2007-05-30 04:46:22 -0400 (Wed, 30 May 2007)
New Revision: 78171

Modified:
   trunk/mono-basic/vbnc/vbnc/source/ChangeLog
   trunk/mono-basic/vbnc/vbnc/source/Emit/Emitter.vb
   trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb
   trunk/mono-basic/vbnc/vbnc/source/General/MethodBaseDeclaration.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/AttributeArguments.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/AttributePositionalArgumentList.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/ExternalSubDeclaration.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializer.vb
   trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializerList.vb
   trunk/mono-basic/vbnc/vbnc/source/Parser/Parser(Members2).vb
   trunk/mono-basic/vbnc/vbnc/source/Tokens/Span.vb
Log:
* Members/ExternalSubDeclaration.vb: Make his actually work.
* Members/VariablePropertyInitializer.vb: Parse external methods
  correctly.
* General/MethodBaseDeclaration.vb: Declare methods doesn't have method
  body.

Modified: trunk/mono-basic/vbnc/vbnc/source/ChangeLog
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/ChangeLog 2007-05-30 08:45:53 UTC (rev 
78170)
+++ trunk/mono-basic/vbnc/vbnc/source/ChangeLog 2007-05-30 08:46:22 UTC (rev 
78171)
@@ -1,3 +1,11 @@
+2007-05-30  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
+
+       * Members/ExternalSubDeclaration.vb: Make his actually work.
+       * Members/VariablePropertyInitializer.vb: Parse external methods
+         correctly.
+       * General/MethodBaseDeclaration.vb: Declare methods doesn't have method
+         body.
+
 2007-05-25  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
 
        * General/CodeFile.vb: Create the symbol document when needed (during

Modified: trunk/mono-basic/vbnc/vbnc/source/Emit/Emitter.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Emit/Emitter.vb   2007-05-30 08:45:53 UTC 
(rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Emit/Emitter.vb   2007-05-30 08:46:22 UTC 
(rev 78171)
@@ -1345,27 +1345,7 @@
         EmitNewArr(Info, ElementType)
     End Sub
 
-    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As Boolean)
-        If I Then
-            EmitLoadI4Value(Info, -1, Info.Compiler.TypeCache.System_Boolean)
-        Else
-            EmitLoadI4Value(Info, 0, Info.Compiler.TypeCache.System_Boolean)
-        End If
-    End Sub
-
-    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As UInteger)
-        EmitLoadI4Value(Info, BitConverter.ToInt32(BitConverter.GetBytes(I), 
0), Info.Compiler.TypeCache.System_UInt32)
-    End Sub
-
-    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As UInteger, 
ByVal TypeToPushOnStack As Type)
-        TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
-        EmitLoadI4Value(Info, BitConverter.ToInt32(BitConverter.GetBytes(I), 
0), TypeToPushOnStack)
-    End Sub
-
-    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As Integer)
-        EmitLoadI4Value(Info, I, Info.Compiler.TypeCache.System_Int32)
-    End Sub
-
+  
     Shared Sub EmitLoadI8Value(ByVal Info As EmitInfo, ByVal I As ULong, ByVal 
TypeToPushOnStack As Type)
         TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
         EmitLoadI8Value(Info, BitConverter.ToInt64(BitConverter.GetBytes(I), 
0), TypeToPushOnStack)
@@ -1402,12 +1382,6 @@
         Info.Stack.Push(Info.Compiler.TypeCache.System_Single)
     End Sub
 
-    Shared Sub EmitLoadR4Value(ByVal Info As EmitInfo, ByVal I As Single, 
ByVal TypeToPushOnStack As Type)
-        TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
-        Info.ILGen.Emit(OpCodes.Ldc_R4, I)
-        Info.Stack.Push(TypeToPushOnStack)
-    End Sub
-
     Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As Integer, 
ByVal TypeToPushOnStack As Type)
         TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
         Select Case I
@@ -1439,7 +1413,33 @@
         End Select
         Info.Stack.Push(TypeToPushOnStack)
     End Sub
+    Shared Sub EmitLoadR4Value(ByVal Info As EmitInfo, ByVal I As Single, 
ByVal TypeToPushOnStack As Type)
+        TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
+        Info.ILGen.Emit(OpCodes.Ldc_R4, I)
+        Info.Stack.Push(TypeToPushOnStack)
+    End Sub
 
+    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As Boolean)
+        If I Then
+            EmitLoadI4Value(Info, -1, Info.Compiler.TypeCache.System_Boolean)
+        Else
+            EmitLoadI4Value(Info, 0, Info.Compiler.TypeCache.System_Boolean)
+        End If
+    End Sub
+
+    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As UInteger)
+        EmitLoadI4Value(Info, BitConverter.ToInt32(BitConverter.GetBytes(I), 
0), Info.Compiler.TypeCache.System_UInt32)
+    End Sub
+
+    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As UInteger, 
ByVal TypeToPushOnStack As Type)
+        TypeToPushOnStack = Helper.GetTypeOrTypeBuilder(TypeToPushOnStack)
+        EmitLoadI4Value(Info, BitConverter.ToInt32(BitConverter.GetBytes(I), 
0), TypeToPushOnStack)
+    End Sub
+
+    Shared Sub EmitLoadI4Value(ByVal Info As EmitInfo, ByVal I As Integer)
+        EmitLoadI4Value(Info, I, Info.Compiler.TypeCache.System_Int32)
+    End Sub
+
     ''' <summary>
     ''' Loads an value of the desired type onto the evaluation stack.
     ''' </summary>

Modified: trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb   2007-05-30 
08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/General/AssemblyInfo.vb   2007-05-30 
08:46:22 UTC (rev 78171)
@@ -49,4 +49,4 @@
 ' You can specify all the values or you can default the Build and Revision 
Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("0.0.0.5520")>
+<Assembly: AssemblyVersion("0.0.0.5532")>

Modified: trunk/mono-basic/vbnc/vbnc/source/General/MethodBaseDeclaration.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/General/MethodBaseDeclaration.vb  
2007-05-30 08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/General/MethodBaseDeclaration.vb  
2007-05-30 08:46:22 UTC (rev 78171)
@@ -154,6 +154,8 @@
         Get
             Dim result As Boolean
 
+            If TypeOf Me Is ExternalSubDeclaration Then Return False
+
             result = CBool(m_MethodAttributes.Value And 
Reflection.MethodAttributes.Abstract) = False AndAlso 
CBool(m_MethodImplAttributes.Value And Reflection.MethodImplAttributes.Runtime) 
= False
 
             If result Then

Modified: trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb      2007-05-30 
08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Members/Attribute.vb      2007-05-30 
08:46:22 UTC (rev 78171)
@@ -80,14 +80,20 @@
         End Get
     End Property
 
-    ReadOnly Property ResolvedType() As Type
+    Property ResolvedType() As Type
         Get
             Return m_ResolvedType
         End Get
+        Set(ByVal value As Type)
+            m_ResolvedType = value
+        End Set
     End Property
 
     ReadOnly Property AttributeArguments() As AttributeArguments
         Get
+            If m_AttributeArguments Is Nothing Then
+                m_AttributeArguments = New AttributeArguments(Me)
+            End If
             Return m_AttributeArguments
         End Get
     End Property
@@ -183,7 +189,7 @@
                     Dim member As MemberInfo
                     Dim members As Generic.List(Of MemberInfo)
 
-                    name = item.IdentifierOrKeyword.Identifier
+                    name = item.Identifier
                     members = cache.LookupFlattenedMembers(name)
                     members = Helper.FilterExternalInaccessible(Info.Compiler, 
members)
                     If members.Count <> 1 Then

Modified: trunk/mono-basic/vbnc/vbnc/source/Members/AttributeArguments.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Members/AttributeArguments.vb     
2007-05-30 08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Members/AttributeArguments.vb     
2007-05-30 08:46:22 UTC (rev 78171)
@@ -60,12 +60,18 @@
 
     ReadOnly Property PositionalArgumentList() As 
AttributePositionalArgumentList
         Get
+            If m_AttributePositionalArgumentList Is Nothing Then
+                m_AttributePositionalArgumentList = New 
AttributePositionalArgumentList(Me)
+            End If
             Return m_AttributePositionalArgumentList
         End Get
     End Property
 
     ReadOnly Property VariablePropertyInitializerList() As 
VariablePropertyInitializerList
         Get
+            If m_VariablePropertyInitializerList Is Nothing Then
+                m_VariablePropertyInitializerList = New 
VariablePropertyInitializerList(Me)
+            End If
             Return m_VariablePropertyInitializerList
         End Get
     End Property

Modified: 
trunk/mono-basic/vbnc/vbnc/source/Members/AttributePositionalArgumentList.vb
===================================================================
--- 
trunk/mono-basic/vbnc/vbnc/source/Members/AttributePositionalArgumentList.vb    
    2007-05-30 08:45:53 UTC (rev 78170)
+++ 
trunk/mono-basic/vbnc/vbnc/source/Members/AttributePositionalArgumentList.vb    
    2007-05-30 08:46:22 UTC (rev 78171)
@@ -32,6 +32,12 @@
         MyBase.New(Parent)
     End Sub
 
+    Overloads Sub Add(ByVal Constant As Object)
+        Dim exp As New AttributeArgumentExpression(Me)
+        exp.Init(New ConstantExpression(exp, Constant, Constant.GetType))
+        Add(exp)
+    End Sub
+
     Shared Function CanBeMe(ByVal tm As tm) As Boolean
         Return AttributeArgumentExpression.CanBeMe(tm)
     End Function

Modified: trunk/mono-basic/vbnc/vbnc/source/Members/ExternalSubDeclaration.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Members/ExternalSubDeclaration.vb 
2007-05-30 08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Members/ExternalSubDeclaration.vb 
2007-05-30 08:46:22 UTC (rev 78171)
@@ -31,6 +31,7 @@
     Private m_LibraryClause As LibraryClause
     Private m_AliasClause As AliasClause
 
+
     Sub New(ByVal Parent As TypeDeclaration)
         MyBase.New(Parent)
     End Sub
@@ -84,4 +85,30 @@
         Return tm.PeekToken(i + 1) = KS.Sub AndAlso tm.PeekToken(i + 
2).IsIdentifier
     End Function
 
+    Public Overrides Function ResolveMember(ByVal Info As ResolveInfo) As 
Boolean
+        Dim result As Boolean = True
+
+        result = MyBase.ResolveMember(Info) AndAlso result
+
+        Dim attrib As New Attribute(Me)
+        attrib.ResolvedType = 
Compiler.TypeCache.System_Runtime_InteropServices_DllImportAttribute
+        
attrib.AttributeArguments.PositionalArgumentList.Add(m_LibraryClause.StringLiteral.StringLiteral)
+        
attrib.AttributeArguments.VariablePropertyInitializerList.Add("EntryPoint", 
Name)
+        
attrib.AttributeArguments.VariablePropertyInitializerList.Add("SetLastError", 
True)
+        Select Case m_CharsetModifier
+            Case KS.Auto
+                
attrib.AttributeArguments.VariablePropertyInitializerList.Add("CharSet", 
System.Runtime.InteropServices.CharSet.Auto)
+            Case KS.Unicode
+                
attrib.AttributeArguments.VariablePropertyInitializerList.Add("CharSet", 
System.Runtime.InteropServices.CharSet.Unicode)
+            Case KS.Ansi
+                
attrib.AttributeArguments.VariablePropertyInitializerList.Add("CharSet", 
System.Runtime.InteropServices.CharSet.Ansi)
+            Case Else
+                Throw New InternalException
+        End Select
+        Me.CustomAttributes.Add(attrib)
+
+        Return result
+    End Function
+
+
 End Class

Modified: 
trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializer.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializer.vb    
2007-05-30 08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializer.vb    
2007-05-30 08:46:22 UTC (rev 78171)
@@ -25,6 +25,7 @@
 Public Class VariablePropertyInitializer
     Inherits ParsedObject
 
+    Private m_Identifier As String
     Private m_IdentifierOrKeyword As IdentifierOrKeyword
     Private m_AttributeArgumentExpression As AttributeArgumentExpression
 
@@ -36,9 +37,12 @@
         Return result
     End Function
 
-    ReadOnly Property IdentifierOrKeyword() As IdentifierOrKeyword
+    ReadOnly Property Identifier() As String
         Get
-            Return m_IdentifierOrKeyword
+            If m_Identifier IsNot Nothing Then
+                Return m_Identifier
+            End If
+            Return m_IdentifierOrKeyword.Identifier
         End Get
     End Property
 
@@ -52,6 +56,11 @@
         MyBase.New(Parent)
     End Sub
 
+    Sub Init(ByVal Identifier As String, ByVal AttributeArgumentExpression As 
AttributeArgumentExpression)
+        m_Identifier = Identifier
+        m_AttributeArgumentExpression = AttributeArgumentExpression
+    End Sub
+
     Sub Init(ByVal IdentifierOrKeyword As IdentifierOrKeyword, ByVal 
AttributeArgumentExpression As AttributeArgumentExpression)
         m_IdentifierOrKeyword = IdentifierOrKeyword
         m_AttributeArgumentExpression = AttributeArgumentExpression

Modified: 
trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializerList.vb
===================================================================
--- 
trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializerList.vb    
    2007-05-30 08:45:53 UTC (rev 78170)
+++ 
trunk/mono-basic/vbnc/vbnc/source/Members/VariablePropertyInitializerList.vb    
    2007-05-30 08:46:22 UTC (rev 78171)
@@ -27,6 +27,14 @@
 Public Class VariablePropertyInitializerList
     Inherits BaseList(Of VariablePropertyInitializer)
 
+    Overloads Sub Add(ByVal Name As String, ByVal Value As Object)
+        Dim var As New VariablePropertyInitializer(Me)
+        Dim exp As New AttributeArgumentExpression(var)
+        exp.Init(New ConstantExpression(var, Value, Value.GetType))
+        var.Init(Name, exp)
+        Add(var)
+    End Sub
+
     Shared Function IsMe(ByVal tm As tm) As Boolean
         Return VariablePropertyInitializer.IsMe(tm)
     End Function

Modified: trunk/mono-basic/vbnc/vbnc/source/Parser/Parser(Members2).vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Parser/Parser(Members2).vb        
2007-05-30 08:45:53 UTC (rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Parser/Parser(Members2).vb        
2007-05-30 08:46:22 UTC (rev 78171)
@@ -508,7 +508,7 @@
         Dim result As New ExternalSubDeclaration(Parent)
 
         Dim m_Modifiers As Modifiers = Nothing
-        Dim m_CharsetModifier As KS = Nothing
+        Dim m_CharsetModifier As KS
         Dim m_Identifier As Token = Nothing
         Dim m_LibraryClause As LibraryClause = Nothing
         Dim m_AliasClause As AliasClause = Nothing
@@ -523,9 +523,13 @@
             tm.NextToken()
         End If
 
-        tm.AcceptIfNotInternalError(KS.Function)
+        tm.AcceptIfNotInternalError(KS.Sub)
 
-        If tm.AcceptIdentifier(m_Identifier) = False Then 
Helper.ErrorRecoveryNotImplemented()
+        If tm.CurrentToken.IsIdentifier = False Then
+            Helper.ErrorRecoveryNotImplemented()
+        End If
+        m_Identifier = tm.CurrentToken
+        tm.NextToken()
 
         m_LibraryClause = ParseLibraryClause(result)
         If m_LibraryClause Is Nothing Then Helper.ErrorRecoveryNotImplemented()
@@ -536,8 +540,9 @@
         End If
 
         If tm.Accept(KS.LParenthesis) Then
+            m_ParameterList = New ParameterList(result)
             If tm.Accept(KS.RParenthesis) = False Then
-                If ParseList(Of Parameter)(m_ParameterList, New 
ParseDelegate_Parent(Of Parameter)(AddressOf ParseParameter), result) = False 
Then
+                If ParseList(Of Parameter)(m_ParameterList, New 
ParseDelegate_Parent(Of Parameter)(AddressOf ParseParameter), m_ParameterList) 
= False Then
                     Helper.ErrorRecoveryNotImplemented()
                 End If
 
@@ -583,7 +588,11 @@
 
         tm.AcceptIfNotInternalError(KS.Function)
 
-        If tm.AcceptIdentifier(m_Identifier) = False Then 
Helper.ErrorRecoveryNotImplemented()
+        If tm.CurrentToken.IsIdentifier = False Then
+            Helper.ErrorRecoveryNotImplemented()
+        End If
+        m_Identifier = tm.CurrentToken
+        tm.NextToken()
 
         m_LibraryClause = ParseLibraryClause(result)
         If m_LibraryClause Is Nothing Then Helper.ErrorRecoveryNotImplemented()
@@ -593,8 +602,9 @@
             If m_AliasClause Is Nothing Then 
Helper.ErrorRecoveryNotImplemented()
         End If
         If tm.Accept(KS.LParenthesis) Then
+            m_ParameterList = New ParameterList(result)
             If tm.Accept(KS.RParenthesis) = False Then
-                If ParseList(Of Parameter)(m_ParameterList, New 
ParseDelegate_Parent(Of Parameter)(AddressOf ParseParameter), result) = False 
Then
+                If ParseList(Of Parameter)(m_ParameterList, New 
ParseDelegate_Parent(Of Parameter)(AddressOf ParseParameter), m_ParameterList) 
= False Then
                     Helper.ErrorRecoveryNotImplemented()
                 End If
 
@@ -652,6 +662,7 @@
 
         If tm.CurrentToken.IsStringLiteral Then
             m_StringLiteral = tm.CurrentToken
+            tm.NextToken()
         Else
             Helper.NotImplemented() 'TODO: Adderror
             m_StringLiteral = Nothing

Modified: trunk/mono-basic/vbnc/vbnc/source/Tokens/Span.vb
===================================================================
--- trunk/mono-basic/vbnc/vbnc/source/Tokens/Span.vb    2007-05-30 08:45:53 UTC 
(rev 78170)
+++ trunk/mono-basic/vbnc/vbnc/source/Tokens/Span.vb    2007-05-30 08:46:22 UTC 
(rev 78171)
@@ -146,7 +146,7 @@
     End Sub
 
     Public Sub New(ByVal FromLocation As Span, ByVal ToLocation As Span)
-        Me.New(FromLocation.FileIndex, FromLocation.Line, FromLocation.Column, 
ToLocation.Column)
+        Me.New(FromLocation.FileIndex - 1US, FromLocation.Line, 
FromLocation.Column, ToLocation.Column)
         Helper.Assert(FromLocation.FileIndex = ToLocation.FileIndex)
     End Sub
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to