Skip to content

Commit fd8b696

Browse files
committed
remove Spec# leftovers
1 parent dd99ff4 commit fd8b696

File tree

93 files changed

+2841
-3545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2841
-3545
lines changed

Source/AbstractInterpretation/Traverse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public static List<Block> ComputeLoopBodyFrom(Block block)
118118
Contract.Assert(rootBlock == null);
119119
rootBlock = block;
120120

121-
List<Block /*!*/> blocksInLoop = new List<Block /*!*/>(); // We use a list just because .net does not define a set
122-
List<Block /*!*/> visitingPath = new List<Block /*!*/>(); // The order is important, as we want paths
121+
List<Block> blocksInLoop = new List<Block>(); // We use a list just because .net does not define a set
122+
List<Block> visitingPath = new List<Block>(); // The order is important, as we want paths
123123

124124
blocksInLoop.Add(block);
125125

Source/BaseTypes/BigDec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public override int GetHashCode()
153153
}
154154

155155
[Pure]
156-
public override string /*!*/ ToString()
156+
public override string ToString()
157157
{
158158
Contract.Ensures(Contract.Result<string>() != null);
159159
return String.Format("{0}e{1}", this.mantissa.ToString(), this.exponent.ToString());

Source/BaseTypes/BigFloat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public override int GetHashCode()
213213
}
214214

215215
[Pure]
216-
public override string /*!*/ ToString()
216+
public override string ToString()
217217
{
218218
Contract.Ensures(Contract.Result<string>() != null);
219219
if (value == "")

Source/BaseTypes/BigNum.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public override int GetHashCode()
145145
}
146146

147147
[Pure]
148-
public override string /*!*/ ToString()
148+
public override string ToString()
149149
{
150150
Contract.Ensures(Contract.Result<string>() != null);
151151
return Cce.NonNull(val.ToString());
@@ -158,7 +158,7 @@ public override int GetHashCode()
158158
// int32.ToString(format) does)
159159

160160
[Pure]
161-
public string /*!*/ ToString(string /*!*/ format)
161+
public string ToString(string format)
162162
{
163163
Contract.Requires(format != null);
164164
Contract.Ensures(Contract.Result<string>() != null);
@@ -185,7 +185,7 @@ public override int GetHashCode()
185185
private static readonly System.Numerics.BigInteger BI_2_TO_24 = new BIM(0x1000000);
186186

187187
[Pure]
188-
private string /*!*/ toHex(string /*!*/ format)
188+
private string toHex(string format)
189189
{
190190
Contract.Requires(format != null);
191191
Contract.Ensures(Contract.Result<string>() != null);
@@ -202,7 +202,7 @@ public override int GetHashCode()
202202
}
203203

204204
[Pure]
205-
private int extractPrecision(string /*!*/ format)
205+
private int extractPrecision(string format)
206206
{
207207
Contract.Requires(format != null);
208208
if (format.Length > 1)
@@ -216,7 +216,7 @@ private int extractPrecision(string /*!*/ format)
216216
}
217217

218218
[Pure]
219-
private string /*!*/ addMinus(int signum, string /*!*/ suffix)
219+
private string addMinus(int signum, string suffix)
220220
{
221221
Contract.Requires(suffix != null);
222222
Contract.Ensures(Contract.Result<string>() != null);
@@ -229,7 +229,7 @@ private int extractPrecision(string /*!*/ format)
229229
}
230230

231231
[Pure]
232-
private string /*!*/ prefixWithZeros(int minLength, string /*!*/ suffix)
232+
private string prefixWithZeros(int minLength, string suffix)
233233
{
234234
Contract.Requires(suffix != null);
235235
Contract.Ensures(Contract.Result<string>() != null);

Source/BaseTypes/Rational.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public BigNum Denominator
129129
get { return denominator == BigNum.ZERO ? BigNum.ONE : denominator; }
130130
}
131131

132-
public override string /*!*/ ToString()
132+
public override string ToString()
133133
{
134134
Contract.Ensures(Contract.Result<string>() != null);
135135
return String.Format("{0}/{1}", Numerator, Denominator);

Source/BaseTypes/RoundingMode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public override int GetHashCode()
6767
}
6868

6969
[Pure]
70-
public override string /*!*/ ToString()
70+
public override string ToString()
7171
{
7272
Contract.Ensures(Contract.Result<string>() != null);
7373
return val;

Source/BaseTypes/Set.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public GSet()
3030
//:base();
3131
}
3232

33-
private GSet(Dictionary<T, int> /*!*/ ht, List<T> arr)
33+
private GSet(Dictionary<T, int> ht, List<T> arr)
3434
{
3535
Contract.Requires(ht != null);
3636
Contract.Requires(arr != null);
@@ -47,7 +47,7 @@ public GSet(int capacity)
4747
}
4848

4949

50-
public readonly static GSet<T> /*!*/
50+
public readonly static GSet<T>
5151
Empty = new GSet<T>();
5252

5353
public void Clear()
@@ -146,7 +146,7 @@ public T Take()
146146
return r;
147147
}
148148

149-
public void Intersect(GSet<T> /*!*/ s)
149+
public void Intersect(GSet<T> s)
150150
{
151151
Contract.Requires(s != null);
152152
if (s == this)
@@ -222,7 +222,7 @@ public bool ContainsRange(IEnumerable<T> s)
222222
return true;
223223
}
224224

225-
public object /*!*/ Clone()
225+
public object Clone()
226226
{
227227
Contract.Ensures(Contract.Result<object>() != null);
228228
return new GSet<T>(new Dictionary<T, int>(ht), new List<T>(arr));
@@ -234,11 +234,11 @@ public virtual int Count
234234
}
235235

236236
[Pure]
237-
public override string /*!*/ ToString()
237+
public override string ToString()
238238
{
239239
Contract.Ensures(Contract.Result<string>() != null);
240240
string s = null;
241-
foreach (object /*!*/ key in ht.Keys)
241+
foreach (object key in ht.Keys)
242242
{
243243
Contract.Assert(key != null);
244244
if (s == null)
@@ -266,34 +266,33 @@ public virtual int Count
266266
//----------------------------- Static Methods ---------------------------------
267267

268268
// Functional Intersect
269-
public static GSet<T> /*!*/ Intersect(GSet<T> /*!*/ a, GSet<T> /*!*/ b)
269+
public static GSet<T> Intersect(GSet<T> a, GSet<T> b)
270270
{
271271
Contract.Requires(b != null);
272272
Contract.Requires(a != null);
273273
Contract.Ensures(Contract.Result<GSet<T>>() != null);
274-
//Contract.Ensures(Contract.ForAll(result, x => a[x] && b[x] ));
275-
GSet<T> /*!*/
276-
res = (GSet<T> /*!*/) Cce.NonNull(a.Clone());
274+
GSet<T>
275+
res = (GSet<T>) Cce.NonNull(a.Clone());
277276
res.Intersect(b);
278277
return res;
279278
}
280279

281280
// Functional Union
282-
public static GSet<T> /*!*/ Union(GSet<T> /*!*/ a, GSet<T> /*!*/ b)
281+
public static GSet<T> Union(GSet<T> a, GSet<T> b)
283282
{
284283
Contract.Requires(a != null);
285284
Contract.Requires(b != null);
286285
Contract.Ensures(Contract.Result<GSet<T>>() != null);
287286
// Contract.Ensures(Contract.ForAll(result, x => a[x] || b[x] ));
288-
GSet<T> /*!*/
289-
res = (GSet<T> /*!*/) Cce.NonNull(a.Clone());
287+
GSet<T>
288+
res = (GSet<T>) Cce.NonNull(a.Clone());
290289
res.AddRange(b);
291290
return res;
292291
}
293292

294-
public delegate bool SetFilter(object /*!*/ obj);
293+
public delegate bool SetFilter(object obj);
295294

296-
public static GSet<T> /*!*/ Filter(GSet<T> /*!*/ a, Func<T, bool> filter)
295+
public static GSet<T> Filter(GSet<T> a, Func<T, bool> filter)
297296
{
298297
Contract.Requires(filter != null);
299298
Contract.Requires(a != null);

Source/Concurrency/CivlUtil.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public static HavocCmd HavocCmd(params IdentifierExpr[] vars)
306306

307307
public static class BlockHelper
308308
{
309-
public static readonly IToken /*!*/ ReportedNoToken = new Token();
309+
public static readonly IToken ReportedNoToken = new Token();
310310

311311
public static Block Block(string label, List<Cmd> cmds)
312312
{

0 commit comments

Comments
 (0)