//
// Copyright 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com)
// Copyright 2004-2011 Novell, Inc
+// Copyright 2011 Xamarin Inc
//
using System;
static object evaluator_lock = new object ();
static volatile bool invoking;
+#if !STATIC
static int count;
+#endif
static Thread invoke_thread;
readonly Dictionary<string, Tuple<FieldSpec, FieldInfo>> fields;
Type base_class;
bool inited;
+ int startup_files;
readonly CompilerContext ctx;
readonly ModuleContainer module;
readonly ReflectionImporter importer;
readonly CompilationSourceFile source_file;
- public Evaluator (CompilerSettings settings, Report report)
+ public Evaluator (CompilerContext ctx)
{
- ctx = new CompilerContext (settings, report);
+ this.ctx = ctx;
module = new ModuleContainer (ctx);
module.Evaluator = this;
- source_file = new CompilationSourceFile ("{interactive}", "", 1);
- source_file.NamespaceContainer = new NamespaceEntry (module, null, source_file, null);
+ source_file = new CompilationSourceFile (module);
+ module.AddTypeContainer (source_file);
- ctx.SourceFiles.Add (source_file);
+ startup_files = ctx.SourceFiles.Count;
// FIXME: Importer needs this assembly for internalsvisibleto
module.SetDeclaringAssembly (new AssemblyDefinitionDynamic (module, "evaluator"));
inited = true;
}
+ void ParseStartupFiles ()
+ {
+ Driver d = new Driver (ctx);
+
+ Location.Initialize (ctx.SourceFiles);
+
+ var parser_session = new ParserSession ();
+ for (int i = 0; i < startup_files; ++i) {
+ var sf = ctx.SourceFiles [i];
+ d.Parse (sf, module, parser_session);
+ }
+ }
+
void Reset ()
{
CompilerCallableEntryPoint.PartialReset ();
/// </summary>
public bool DescribeTypeExpressions;
+ /// <summary>
+ /// Whether the evaluator will use terse syntax, and the semicolons at the end are optional
+ /// </summary>
+ public bool Terse = true;
+
/// <summary>
/// The base class for the classes that host the user generated code
/// </summary>
/// compiled parameter will be set to the delegate
/// that can be invoked to execute the code.
///
- /// </remarks>
+ /// </remarks>
public string Compile (string input, out CompiledMethod compiled)
{
if (input == null || input.Length == 0){
}
lock (evaluator_lock){
- if (!inited)
+ if (!inited) {
Init ();
- else
+ ParseStartupFiles ();
+ } else {
ctx.Report.Printer.Reset ();
+ }
bool partial_input;
CSharpParser parser = ParseString (ParseMode.Silent, input, out partial_input);
+ if (parser == null && Terse && partial_input){
+ bool ignore;
+ parser = ParseString (ParseMode.Silent, input + ";", out ignore);
+ }
if (parser == null){
compiled = null;
if (partial_input)
bool partial_input;
CSharpParser parser = ParseString (ParseMode.GetCompletions, input, out partial_input);
if (parser == null){
- if (CSharpParser.yacc_verbose_flag != 0)
- Console.WriteLine ("DEBUG: No completions available");
return null;
}
module.SetDeclaringAssembly (a);
// Need to setup MemberCache
- parser_result.CreateType ();
+ parser_result.CreateContainer ();
- var method = parser_result.Methods[0] as Method;
+ var method = parser_result.Members[0] as Method;
BlockContext bc = new BlockContext (method, method.Block, ctx.BuiltinTypes.Void);
try {
//
InputKind ToplevelOrStatement (SeekableStreamReader seekable)
{
- Tokenizer tokenizer = new Tokenizer (seekable, source_file, ctx);
+ Tokenizer tokenizer = new Tokenizer (seekable, source_file, new ParserSession ());
int t = tokenizer.token ();
switch (t){
{
partial_input = false;
Reset ();
- Tokenizer.LocatedToken.Initialize ();
var enc = ctx.Settings.Encoding;
var s = new MemoryStream (enc.GetBytes (input));
}
seekable.Position = 0;
- source_file.NamespaceContainer.DeclarationFound = false;
- CSharpParser parser = new CSharpParser (seekable, source_file);
+ source_file.DeclarationFound = false;
+ CSharpParser parser = new CSharpParser (seekable, source_file, new ParserSession ());
if (kind == InputKind.StatementOrExpression){
parser.Lexer.putback_char = Tokenizer.EvalStatementParserCharacter;
parser.Lexer.CompleteOnEOF = true;
ReportPrinter old_printer = null;
- if ((mode == ParseMode.Silent || mode == ParseMode.GetCompletions) && CSharpParser.yacc_verbose_flag == 0)
+ if ((mode == ParseMode.Silent || mode == ParseMode.GetCompletions))
old_printer = ctx.Report.SetPrinter (new StreamReportPrinter (TextWriter.Null));
try {
CompiledMethod CompileBlock (Class host, Undo undo, Report Report)
{
- string current_debug_name = "eval-" + count + ".dll";
- ++count;
#if STATIC
throw new NotSupportedException ();
#else
+ string current_debug_name = "eval-" + count + ".dll";
+ ++count;
+
AssemblyDefinitionDynamic assembly;
AssemblyBuilderAccess access;
new TypeExpression (base_class_imported, host.Location)
};
- host.AddBasesForPart (host, baseclass_list);
+ host.AddBasesForPart (baseclass_list);
- host.CreateType ();
- host.DefineType ();
+ host.CreateContainer ();
+ host.DefineContainer ();
host.Define ();
- expression_method = (Method) host.Methods[0];
+ expression_method = (Method) host.Members[0];
} else {
expression_method = null;
}
- module.CreateType ();
+ module.CreateContainer ();
+ source_file.EnableUsingClausesRedefinition ();
module.Define ();
if (Report.Errors != 0){
}
if (host != null){
- host.EmitType ();
+ host.EmitContainer ();
}
- module.Emit ();
+ module.EmitContainer ();
if (Report.Errors != 0){
if (undo != null)
undo.ExecuteUndo ();
return null;
}
- module.CloseType ();
+ module.CloseContainer ();
if (host != null)
- host.CloseType ();
+ host.CloseContainer ();
if (access == AssemblyBuilderAccess.RunAndSave)
assembly.Save ();
// work from MethodBuilders. Retarded, I know.
//
var tt = assembly.Builder.GetType (host.TypeBuilder.Name);
- var mi = tt.GetMethod (expression_method.Name);
-
- if (host.Fields != null) {
- //
- // We need to then go from FieldBuilder to FieldInfo
- // or reflection gets confused (it basically gets confused, and variables override each
- // other).
- //
- foreach (Field field in host.Fields) {
- var fi = tt.GetField (field.Name);
-
- Tuple<FieldSpec, FieldInfo> old;
-
- // If a previous value was set, nullify it, so that we do
- // not leak memory
- if (fields.TryGetValue (field.Name, out old)) {
- if (old.Item1.MemberType.IsStruct) {
- //
- // TODO: Clear fields for structs
- //
- } else {
- try {
- old.Item2.SetValue (null, null);
- } catch {
- }
+ var mi = tt.GetMethod (expression_method.MemberName.Name);
+
+ //
+ // We need to then go from FieldBuilder to FieldInfo
+ // or reflection gets confused (it basically gets confused, and variables override each
+ // other).
+ //
+ foreach (var member in host.Members) {
+ var field = member as Field;
+ if (field == null)
+ continue;
+
+ var fi = tt.GetField (field.Name);
+
+ Tuple<FieldSpec, FieldInfo> old;
+
+ // If a previous value was set, nullify it, so that we do
+ // not leak memory
+ if (fields.TryGetValue (field.Name, out old)) {
+ if (old.Item1.MemberType.IsStruct) {
+ //
+ // TODO: Clear fields for structs
+ //
+ } else {
+ try {
+ old.Item2.SetValue (null, null);
+ } catch {
}
}
-
- fields[field.Name] = Tuple.Create (field.Spec, fi);
}
+
+ fields[field.Name] = Tuple.Create (field.Spec, fi);
}
return (CompiledMethod) System.Delegate.CreateDelegate (typeof (CompiledMethod), mi);
//foreach (object x in ns.using_alias_list)
// sb.AppendFormat ("using {0};\n", x);
- foreach (var ue in source_file.NamespaceContainer.Usings) {
+ foreach (var ue in source_file.Usings) {
sb.AppendFormat ("using {0};", ue.ToString ());
sb.Append (Environment.NewLine);
}
return sb.ToString ();
}
- internal ICollection<string> GetUsingList ()
+ internal List<string> GetUsingList ()
{
var res = new List<string> ();
- foreach (var ue in source_file.NamespaceContainer.Usings)
- res.Add (ue.ToString ());
+ foreach (var ue in source_file.Usings) {
+ if (ue.Alias != null || ue.ResolvedExpression == null)
+ continue;
+
+ res.Add (ue.NamespaceExpression.Name);
+ }
+
return res;
}
public void LoadAssembly (string file)
{
var loader = new DynamicLoader (importer, ctx);
- var assembly = loader.LoadAssemblyFile (file);
+ var assembly = loader.LoadAssemblyFile (file, false);
if (assembly == null)
return;
static public string help {
get {
return "Static methods:\n" +
- " Describe (object) - Describes the object's type\n" +
- " LoadPackage (package); - Loads the given Package (like -pkg:FILE)\n" +
- " LoadAssembly (assembly) - Loads the given assembly (like -r:ASSEMBLY)\n" +
- " ShowVars (); - Shows defined local variables.\n" +
- " ShowUsing (); - Show active using declarations.\n" +
- " Prompt - The prompt used by the C# shell\n" +
- " ContinuationPrompt - The prompt for partial input\n" +
- " Time(() -> { }) - Times the specified code\n" +
- " print (obj) - Shorthand for Console.WriteLine\n" +
- " quit; - You'll never believe it - this quits the repl!\n" +
- " help; - This help text\n";
+#if !NET_2_1
+ " Describe (object); - Describes the object's type\n" +
+#endif
+ " LoadPackage (package); - Loads the given Package (like -pkg:FILE)\n" +
+ " LoadAssembly (assembly); - Loads the given assembly (like -r:ASSEMBLY)\n" +
+ " ShowVars (); - Shows defined local variables.\n" +
+ " ShowUsing (); - Show active using declarations.\n" +
+ " Prompt - The prompt used by the C# shell\n" +
+ " ContinuationPrompt - The prompt for partial input\n" +
+ " Time (() => { }); - Times the specified code\n" +
+ " print (obj); - Shorthand for Console.WriteLine\n" +
+ " quit; - You'll never believe it - this quits the repl!\n" +
+ " help; - This help text\n";
}
}
}
}
+ /// <summary>
+ /// Same as quit - useful in script scenerios
+ /// </summary>
+ static public void Quit () {
+ QuitRequested = true;
+ }
+
#if !NET_2_1
/// <summary>
/// Describes an object or a type.
{
}
- public override void EmitSymbolInfo ()
- {
- }
-
protected override FieldExpr GetFieldExpression (EmitContext ec)
{
return new FieldExpr (field, field.Location);
ec.Report.SetPrinter (old_printer);
}
- if (tclone != null) {
+ if (tclone is TypeExpr) {
Arguments args = new Arguments (1);
args.Add (new Argument (new TypeOf ((TypeExpr) clone, Location)));
return new Invocation (new SimpleName ("Describe", Location), args).Resolve (ec);
{
}
- public void AddTypeContainer (TypeContainer current_container, TypeContainer tc)
+ public void AddTypeContainer (TypeContainer current_container, TypeDefinition tc)
{
if (current_container == tc){
Console.Error.WriteLine ("Internal error: inserting container into itself");
if (undo_actions == null)
undo_actions = new List<Action> ();
- var existing = current_container.Types.FirstOrDefault (l => l.MemberName.Basename == tc.MemberName.Basename);
+ var existing = current_container.Containers.FirstOrDefault (l => l.Basename == tc.Basename);
if (existing != null) {
- current_container.RemoveTypeContainer (existing);
- existing.NamespaceEntry.SlaveDeclSpace.RemoveTypeContainer (existing);
+ current_container.RemoveContainer (existing);
undo_actions.Add (() => current_container.AddTypeContainer (existing));
}
- undo_actions.Add (() => current_container.RemoveTypeContainer (tc));
+ undo_actions.Add (() => current_container.RemoveContainer (tc));
}
public void ExecuteUndo ()
projects / mono.git / blobdiff