forked from kanaka/mal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vbs: avoid recursion in env.get, remove Self attribute
Make the two remaining attributes public instead of defining getters and setters. Thanks to OldLiu001!
- Loading branch information
1 parent
87d28f0
commit 9e04280
Showing
1 changed file
with
16 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,66 +1,41 @@ | ||
Option Explicit | ||
|
||
Function NewEnv(objOuter) | ||
Dim varRet | ||
Set varRet = New Environment | ||
Set varRet.Self = varRet | ||
Set varRet.Outer = objOuter | ||
Set NewEnv = varRet | ||
Set NewEnv = New Environment | ||
Set NewEnv.Outer = objOuter | ||
End Function | ||
|
||
Class Environment | ||
Private objOuter, objSelf | ||
Private objBinds | ||
Public objOuter | ||
Public objBinds | ||
Private Sub Class_Initialize() | ||
Set objBinds = CreateObject("Scripting.Dictionary") | ||
Set objOuter = Nothing | ||
Set objSelf = Nothing | ||
End Sub | ||
|
||
Public Property Set Outer(objEnv) | ||
Set objOuter = objEnv | ||
End Property | ||
|
||
Public Property Get Outer() | ||
Set Outer = objOuter | ||
End Property | ||
|
||
Public Property Set Self(objEnv) | ||
Set objSelf = objEnv | ||
End Property | ||
|
||
Public Sub Add(varKey, varValue) | ||
Set objBinds.Item(varKey) = varValue | ||
End Sub | ||
|
||
Public Function Find(varKey) | ||
Dim varRet | ||
If objBinds.Exists(varKey) Then | ||
Set varRet = objSelf | ||
Else | ||
If TypeName(objOuter) <> "Nothing" Then | ||
Set varRet = objOuter.Find(varKey) | ||
Else | ||
Public Function [Get](varKey) | ||
Dim objEnv, varRet | ||
Set objEnv = Me | ||
Do | ||
If objEnv.objBinds.Exists(varKey) Then | ||
Set varRet = objEnv.objBinds(varKey) | ||
Exit Do | ||
End If | ||
Set objEnv = objEnv.objOuter | ||
If TypeName(objEnv) = "Nothing" Then | ||
Set varRet = Nothing | ||
Exit Do | ||
End If | ||
End If | ||
Loop | ||
|
||
Set Find = varRet | ||
End Function | ||
|
||
Public Function [Get](varKey) | ||
Dim objEnv, varRet | ||
Set objEnv = Find(varKey) | ||
If objEnv Is objSelf Then | ||
Set varRet = objBinds(varKey) | ||
Else | ||
If TypeName(objEnv) <> "Nothing" Then | ||
Set varRet = objEnv.Get(varKey) | ||
Else | ||
Set varRet = Nothing | ||
End If | ||
End If | ||
|
||
Set [Get] = varRet | ||
End Function | ||
End Class |