1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
From: Fab Stz <fabstz-it@yahoo.fr>
Date: Sun, 13 Apr 2025 14:35:28 +0200
Subject: Remove use of DynamicMetaObject.cs
File Jayrock/src/Jayrock.Json/Dynamic/DynamicMetaObject.cs is removed from the
orig.tar.
This file is licensed under the MS-PL. Paragraph 3D of this license is not
compatible with GPL.
More info: https://github.com/kee-org/keepassrpc/issues/152
---
Jayrock/src/Jayrock.Json/Jayrock.Json.csproj | 2 +-
Jayrock/src/Jayrock.Json/Json/JsonObject.cs | 98 ++++++++++++++--------------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/Jayrock/src/Jayrock.Json/Jayrock.Json.csproj b/Jayrock/src/Jayrock.Json/Jayrock.Json.csproj
index e12fe2b..cda4fb0 100644
--- a/Jayrock/src/Jayrock.Json/Jayrock.Json.csproj
+++ b/Jayrock/src/Jayrock.Json/Jayrock.Json.csproj
@@ -132,7 +132,7 @@
<Compile Include="DictionaryHelper.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="Dynamic\DynamicMetaObject.cs" />
+ <!--Compile Include="Dynamic\DynamicMetaObject.cs" /-->
<Compile Include="IAttributeAttachment.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/Jayrock/src/Jayrock.Json/Json/JsonObject.cs b/Jayrock/src/Jayrock.Json/Json/JsonObject.cs
index 3f7a4fd..9d1f995 100644
--- a/Jayrock/src/Jayrock.Json/Json/JsonObject.cs
+++ b/Jayrock/src/Jayrock.Json/Json/JsonObject.cs
@@ -29,7 +29,7 @@ namespace Jayrock.Json
using System.Diagnostics;
using System.IO;
- using Jayrock.Dynamic;
+// using Jayrock.Dynamic;
using Jayrock.Json.Conversion;
#if !NET_1_0 && !NET_1_1
@@ -70,8 +70,8 @@ namespace Jayrock.Json
System.Collections.Generic.IDictionary<string, object>
#endif
#if !NET_1_0 && !NET_1_1 && !NET_2_0
- /* ... */ ,
- System.Dynamic.IDynamicMetaObjectProvider
+// /* ... */ ,
+// System.Dynamic.IDynamicMetaObjectProvider
#endif
{
private ArrayList _nameIndexList;
@@ -601,52 +601,52 @@ namespace Jayrock.Json
#if !NET_1_0 && !NET_1_1 && !NET_2_0
- DynamicMetaObject IDynamicMetaObjectProvider.GetMetaObject(Expression parameter)
- {
- return new DynamicMetaObject<JsonObject>(parameter, this, _runtime, /* dontFallbackFirst */ true);
- }
-
- private readonly DynamicObjectRuntime<JsonObject> _runtime = new DynamicObjectRuntime<JsonObject>
- {
- TryGetMember = TryGetMember,
- TrySetMember = TrySetMember,
- TryInvokeMember = TryInvokeMember,
- TryDeleteMember = TryDeleteMember,
- GetDynamicMemberNames = o => o.Names.Cast<string>()
- };
-
- private static Option<object> TryInvokeMember(JsonObject obj, InvokeMemberBinder arg2, object[] arg3)
- {
- return Option<object>.None; // TryGetMember(arg1, arg2)
- }
-
- private static bool TryDeleteMember(JsonObject obj, DeleteMemberBinder binder)
- {
- if (!obj.Contains(binder.Name))
- return false;
- obj.Remove(binder.Name);
- return true;
- }
-
- private static bool TrySetMember(JsonObject obj, SetMemberBinder binder, object value)
- {
- obj[binder.Name] = value;
- return true;
- }
-
- private static Option<object> TryGetMember(JsonObject obj, GetMemberBinder binder)
- {
- if (!obj.HasMembers)
- return Option<object>.None;
- var name = binder.Name;
- var value = obj[name];
- if (value == null && !obj.Contains(name))
- {
- // TODO support case-insensitive bindings
- return Option<object>.None;
- }
- return Option.Value(value);
- }
+// DynamicMetaObject IDynamicMetaObjectProvider.GetMetaObject(Expression parameter)
+// {
+// return new DynamicMetaObject<JsonObject>(parameter, this, _runtime, /* dontFallbackFirst */ true);
+// }
+//
+// private readonly DynamicObjectRuntime<JsonObject> _runtime = new DynamicObjectRuntime<JsonObject>
+// {
+// TryGetMember = TryGetMember,
+// TrySetMember = TrySetMember,
+// TryInvokeMember = TryInvokeMember,
+// TryDeleteMember = TryDeleteMember,
+// GetDynamicMemberNames = o => o.Names.Cast<string>()
+// };
+//
+// private static Option<object> TryInvokeMember(JsonObject obj, InvokeMemberBinder arg2, object[] arg3)
+// {
+// return Option<object>.None; // TryGetMember(arg1, arg2)
+// }
+//
+// private static bool TryDeleteMember(JsonObject obj, DeleteMemberBinder binder)
+// {
+// if (!obj.Contains(binder.Name))
+// return false;
+// obj.Remove(binder.Name);
+// return true;
+// }
+//
+// private static bool TrySetMember(JsonObject obj, SetMemberBinder binder, object value)
+// {
+// obj[binder.Name] = value;
+// return true;
+// }
+//
+// private static Option<object> TryGetMember(JsonObject obj, GetMemberBinder binder)
+// {
+// if (!obj.HasMembers)
+// return Option<object>.None;
+// var name = binder.Name;
+// var value = obj[name];
+// if (value == null && !obj.Contains(name))
+// {
+// // TODO support case-insensitive bindings
+// return Option<object>.None;
+// }
+// return Option.Value(value);
+// }
#endif // !NET_1_0 && !NET_1_1 && !NET_2_0
}
|
