diff options
author | 2011-05-10 08:17:42 -0700 | |
---|---|---|
committer | 2011-05-10 08:17:42 -0700 | |
commit | eb8e52a4e8fb049d83c7143da3110a8ec2740474 (patch) | |
tree | a916f27265253e032e5feb365eadc559beb775d3 | |
parent | bb371f7c68a16b8d56ae154fdcd01e56d5612da7 (diff) |
Oops. Last checkin did not contain the changes for the catch clause change when
translating a method body.
-rw-r--r-- | BCT/BytecodeTranslator/MetadataTraverser.cs | 78 | ||||
-rw-r--r-- | BCT/BytecodeTranslator/TranslationHelper.cs | 3 |
2 files changed, 44 insertions, 37 deletions
diff --git a/BCT/BytecodeTranslator/MetadataTraverser.cs b/BCT/BytecodeTranslator/MetadataTraverser.cs index 9d575a20..1fa59767 100644 --- a/BCT/BytecodeTranslator/MetadataTraverser.cs +++ b/BCT/BytecodeTranslator/MetadataTraverser.cs @@ -170,7 +170,6 @@ namespace BytecodeTranslator { if (isEventAddOrRemove)
return;
- this.sink.BeginMethod();
Sink.ProcedureInfo procAndFormalMap;
IMethodDefinition stubMethod = null;
@@ -184,6 +183,7 @@ namespace BytecodeTranslator { return;
}
+ this.sink.BeginMethod();
var decl = procAndFormalMap.Decl;
var proc = decl as Bpl.Procedure;
var formalMap = procAndFormalMap.FormalMap;
@@ -220,38 +220,6 @@ namespace BytecodeTranslator { }
#endregion
- method.Body.Dispatch(stmtTraverser);
-
- #region Create Local Vars For Implementation
- List<Bpl.Variable> vars = new List<Bpl.Variable>();
- foreach (MethodParameter mparam in formalMap.Values) {
- if (!(mparam.underlyingParameter.IsByReference || mparam.underlyingParameter.IsOut))
- vars.Add(mparam.outParameterCopy);
- }
- foreach (Bpl.Variable v in this.sink.LocalVarMap.Values) {
- vars.Add(v);
- }
-
- Bpl.VariableSeq vseq = new Bpl.VariableSeq(vars.ToArray());
- #endregion
-
- if (proc != null) {
- Bpl.Implementation impl =
- new Bpl.Implementation(method.Token(),
- decl.Name,
- new Microsoft.Boogie.TypeVariableSeq(),
- decl.InParams,
- decl.OutParams,
- vseq,
- stmtTraverser.StmtBuilder.Collect(Bpl.Token.NoToken));
-
- impl.Proc = proc;
- this.sink.TranslatedProgram.TopLevelDeclarations.Add(impl);
- } else { // method is translated as a function
- //Bpl.Function func = decl as Bpl.Function;
- //func.Body = new Bpl.CodeExpr(new Bpl.VariableSeq(), new List<Bpl.Block>{ new Bpl.Block(
- }
-
#region Translate method attributes
// Don't need an expression translator because there is a limited set of things
// that can appear as arguments to custom attributes
@@ -287,15 +255,51 @@ namespace BytecodeTranslator { }
#endregion
+ #region Translate body
+ method.Body.Dispatch(stmtTraverser);
+ #endregion
+
+ #region Create Local Vars For Implementation
+ List<Bpl.Variable> vars = new List<Bpl.Variable>();
+ foreach (MethodParameter mparam in formalMap.Values) {
+ if (!(mparam.underlyingParameter.IsByReference || mparam.underlyingParameter.IsOut))
+ vars.Add(mparam.outParameterCopy);
+ }
+ foreach (Bpl.Variable v in this.sink.LocalVarMap.Values) {
+ vars.Add(v);
+ }
+
+ Bpl.VariableSeq vseq = new Bpl.VariableSeq(vars.ToArray());
+ #endregion
+
+ #region Add implementation to Boogie program
+ if (proc != null) {
+ Bpl.Implementation impl =
+ new Bpl.Implementation(method.Token(),
+ decl.Name,
+ new Microsoft.Boogie.TypeVariableSeq(),
+ decl.InParams,
+ decl.OutParams,
+ vseq,
+ stmtTraverser.StmtBuilder.Collect(Bpl.Token.NoToken));
+
+ impl.Proc = proc;
+ this.sink.TranslatedProgram.TopLevelDeclarations.Add(impl);
+ } else { // method is translated as a function
+ //Bpl.Function func = decl as Bpl.Function;
+ //func.Body = new Bpl.CodeExpr(new Bpl.VariableSeq(), new List<Bpl.Block>{ new Bpl.Block(
+ }
+ #endregion
} catch (TranslationException te) {
- Console.WriteLine("Error during translation of '{0}'.",
+ Console.WriteLine("Translation error in body of '{0}'.",
MemberHelper.GetMethodSignature(method, NameFormattingOptions.None));
Console.WriteLine("\t" + te.Message);
- } catch {
- throw;
+ } catch (Exception e) {
+ Console.WriteLine("Unknown error in body of '{0}'.",
+ MemberHelper.GetMethodSignature(method, NameFormattingOptions.None));
+ Console.WriteLine("\t" + e.Message);
} finally {
- // Maybe this is a good place to add the procedure to the toplevel declarations
}
}
diff --git a/BCT/BytecodeTranslator/TranslationHelper.cs b/BCT/BytecodeTranslator/TranslationHelper.cs index 6305496e..42b1a4d0 100644 --- a/BCT/BytecodeTranslator/TranslationHelper.cs +++ b/BCT/BytecodeTranslator/TranslationHelper.cs @@ -120,6 +120,9 @@ namespace BytecodeTranslator { s = s.Replace('\\', '$');
s = s.Replace('=', '$');
s = s.Replace('@', '$');
+ s = s.Replace(';', '$');
+ s = s.Replace('%', '$');
+ s = s.Replace('&', '$');
return s;
}
|