|
@@ -742,16 +742,19 @@ Type TFieldDecl Extends TVarDecl
|
|
End Method
|
|
End Method
|
|
|
|
|
|
Method CheckAccess:Int()
|
|
Method CheckAccess:Int()
|
|
|
|
+
|
|
Local cs:TClassDecl = ClassScope()
|
|
Local cs:TClassDecl = ClassScope()
|
|
|
|
|
|
If IsPrivate() And cs Then
|
|
If IsPrivate() And cs Then
|
|
Local ec:TClassDecl = _env.ClassScope()
|
|
Local ec:TClassDecl = _env.ClassScope()
|
|
|
|
+
|
|
While ec
|
|
While ec
|
|
|
|
+
|
|
If cs = ec Then
|
|
If cs = ec Then
|
|
Return True
|
|
Return True
|
|
End If
|
|
End If
|
|
|
|
|
|
- ec = _env.scope.scope.ClassScope()
|
|
|
|
|
|
+ ec = ec.scope.ClassScope()
|
|
Wend
|
|
Wend
|
|
|
|
|
|
If Not ec Then
|
|
If Not ec Then
|
|
@@ -760,20 +763,18 @@ Type TFieldDecl Extends TVarDecl
|
|
End If
|
|
End If
|
|
If IsProtected() And cs Then
|
|
If IsProtected() And cs Then
|
|
Local ec:TClassDecl = _env.ClassScope()
|
|
Local ec:TClassDecl = _env.ClassScope()
|
|
- If Not ec Return False
|
|
|
|
|
|
|
|
While ec
|
|
While ec
|
|
If ec.ExtendsClass(cs) Then
|
|
If ec.ExtendsClass(cs) Then
|
|
Return True
|
|
Return True
|
|
End If
|
|
End If
|
|
|
|
|
|
- ec = _env.scope.scope.ClassScope()
|
|
|
|
|
|
+ ec = ec.scope.ClassScope()
|
|
Wend
|
|
Wend
|
|
|
|
|
|
If Not ec Then
|
|
If Not ec Then
|
|
Return False
|
|
Return False
|
|
End If
|
|
End If
|
|
- 'If Not ec.ExtendsClass(ClassScope()) Return False
|
|
|
|
End If
|
|
End If
|
|
Return True
|
|
Return True
|
|
End Method
|
|
End Method
|