@@ -45,8 +45,10 @@ namespace Microsoft.Scripting.Silverlight { /// Base class for all browser-based PlatformAdaptationLayers. /// Delegates compatible operations to a BrowserVirtualFileSystem. /// </summary> - internal abstract class BrowserPAL : PlatformAdaptationLayer { - internal BrowserVirtualFilesystem VirtualFilesystem { get; set; } + // BUG: should be internal, but Ruby is refusing to call members if so + public abstract class BrowserPAL : PlatformAdaptationLayer { + + public BrowserVirtualFilesystem VirtualFilesystem { get; internal set; } protected static BrowserPAL _PAL; internal static BrowserPAL PAL { Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/BrowserScriptHost.cs @@ -157,11 +157,18 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> /// <param name="path">a string representing a path</param> /// <returns>a normalized version of "path"</returns> - public virtual string NormalizePath(string path) { + public static string Normalize(string path) { return path.Replace('\\', '/'); } /// <summary> + /// See (static) BrowserVirtualFilesystem.Normalize + /// </summary> + public virtual string NormalizePath(string path) { + return BrowserVirtualFilesystem.Normalize(path); + } + + /// <summary> /// Gets a file's stream /// </summary> /// <param name="storageUnit">Looks for the file in this</param> @@ -220,7 +227,9 @@ namespace Microsoft.Scripting.Silverlight { } else { sri = Application.GetResourceStream((StreamResourceInfo) xap, relativeUri); } - return (sri != null) ? sri.Stream : null; + return sri == null ? + DynamicApplication.GetManifestResourceStream(relativeUri.ToString()) : + sri.Stream; } #region Depricated Methods @@ -252,7 +261,7 @@ namespace Microsoft.Scripting.Silverlight { /// <summary> /// The cache of files already downloaded /// </summary> - private Cache _cache = new Cache(); + private DownloadCache _cache = new DownloadCache(); /// <summary> /// Gets a file out of the download cache. This does not download the @@ -274,13 +283,7 @@ namespace Microsoft.Scripting.Silverlight { if (stream != null) return stream; } - Uri fullUri; - if (relativeUri.IsAbsoluteUri) { - fullUri = relativeUri; - } else { - baseUri = baseUri ?? DefaultBaseUri(); - fullUri = new Uri(NormalizePath(((Uri)baseUri).AbsoluteUri) + relativeUri.ToString(), UriKind.Absolute); - } + var fullUri = DynamicApplication.MakeUri((Uri)baseUri, relativeUri); if (_cache.Has(fullUri)) { return new MemoryStream(System.Text.Encoding.UTF8.GetBytes(_cache[fullUri])); @@ -290,18 +293,6 @@ namespace Microsoft.Scripting.Silverlight { } /// <summary> - /// The default base URI is the HTML page's URI. - /// </summary> - /// <returns></returns> - private Uri DefaultBaseUri() { - var uri = DynamicApplication.Current.BaseUri; - var server = uri.GetComponents(UriComponents.SchemeAndServer, UriFormat.Unescaped); - var path = NormalizePath(Path.GetDirectoryName(uri.LocalPath)); - var defaultBaseUri = new Uri(new Uri(server), path); - return defaultBaseUri; - } - - /// <summary> /// Download and cache a list of URIs, and execute a delegate when it's /// complete. /// </summary> @@ -317,7 +308,7 @@ namespace Microsoft.Scripting.Silverlight { /// <summary> /// A cache of Uris mapping to strings. /// </summary> - public class Cache { + public class DownloadCache { private Dictionary<Uri, string> _cache = new Dictionary<Uri, string>(); @@ -328,7 +319,7 @@ namespace Microsoft.Scripting.Silverlight { /// <param name="uri"></param> /// <param name="code"></param> public void Add(Uri uri, string code) { - if (!_cache.ContainsKey(uri)) { + if (!Has(uri)) { _cache.Add(uri, code); } } @@ -389,7 +380,7 @@ namespace Microsoft.Scripting.Silverlight { content = s.ReadToEnd(); } var key = (Uri)e.UserState; - _cache.Add(key, content); + Add(key, content); downloadQueue.Remove(key); if (downloadQueue.Count == 0) { onComplete.Invoke(); Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/BrowserVirtualFilesystem.cs @@ -22,6 +22,7 @@ using System.Windows; using System.Windows.Resources; using System.Xml; using Microsoft.Scripting.Hosting; +using Microsoft.Scripting.Utils; using System.Net; using System.Text.RegularExpressions; using System.Windows.Markup; @@ -77,11 +78,27 @@ namespace Microsoft.Scripting.Silverlight { internal DynamicLanguageConfig LanguagesConfig { get; private set; } /// <summary> + /// Figure out the best baseUri to use; the entryPoint's path if it's + /// currently running, and the HTML page's path otherwise. + /// </summary> + public static Uri BaseUri { + get { + if (_Current.Engine != null && _Current.Engine.RunningEntryPoint) { + return new Uri( + NormalizePath(Path.GetDirectoryName(Settings.EntryPoint)), + UriKind.RelativeOrAbsolute + ); + } + return _HtmlPageUri; + } + } + + /// <summary> /// Hold onto the base uri since it cannot be accessed from a /// background thread - internal Uri BaseUri { get; private set; } + /// </summary> + internal static Uri _HtmlPageUri; #endregion - #region Depricated Properties [Obsolete("Use DynamicApplication.Current.Engine.Runtime instead")] public ScriptRuntime Runtime { get { return Engine.Runtime; } } @@ -110,7 +127,7 @@ namespace Microsoft.Scripting.Silverlight { private static int _UIThreadId; #endregion - #region Public API + #region LoadComponent, LoadRootVisual // these are instance methods so you can do Application.Current.TheMethod(...) /// <summary> @@ -121,7 +138,7 @@ namespace Microsoft.Scripting.Silverlight { /// <param name="uri">Uri to a XAML file</param> /// <returns>the RootVisual</returns> public DependencyObject LoadRootVisual(UIElement root, Uri uri) { - root = (UIElement) LoadComponent(root, uri); + LoadComponent(root, uri); RootVisual = root; return root; } @@ -134,25 +151,20 @@ namespace Microsoft.Scripting.Silverlight { /// <param name="uri">string representing the relative Uri of the XAML file</param> /// <returns>the RootVisual</returns> public DependencyObject LoadRootVisual(UIElement root, string xamlUri) { - return LoadRootVisual(root, xamlUri, true); + return LoadRootVisual(root, MakeUri(xamlUri)); } /// <summary> - /// Either loads a XAML file URI, or the XAML itself, represented by a string, + /// Loads the XAML itself, represented by a string, /// and sets the RootVisual of the application. /// </summary> - /// <param name="root">element to load XAML into</param> - /// <param name="xamlOrUri">string representing a URI of a XAML file, or the XAML content itself</param> - /// <param name="uri">set this to "true" if "xamlOrUri" is a URI, and "false" if it is XAML content</param> + /// <param name="root">UIElement to load XAML into</param> + /// <param name="xamlString">the XAML content itself</param> /// <returns>the RootVisual</returns> - public DependencyObject LoadRootVisual(UIElement root, string xamlOrUri, bool uri) { - if (uri) { - return LoadRootVisual(root, MakeUri(xamlOrUri)); - } else { - root = (UIElement)LoadComponent(root, xamlOrUri, false); - RootVisual = root; - return root; - } + public DependencyObject LoadRootVisualFromString(string xamlString) { + var root = LoadComponentFromString(xamlString) as UIElement; + RootVisual = root; + return root; } /// <summary> @@ -160,24 +172,8 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> /// <param name="component">The object to load the XAML into</param> /// <param name="uri">string representing the relative Uri of the XAML file</param> - public object LoadComponent(object component, string xamlUri) { - return LoadComponent(component, xamlUri, true); - } - - /// <summary> - /// Loads a XAML file or XAML content into an object. - /// </summary> - /// <param name="component">The object to load XAML into</param> - /// <param name="xamlOrUri">either the URI of a XAML file, or the actual XAML content</param> - /// <param name="uri">set this to "true" if "xamlOrUri" is a URI, and "false" if it is XAML content</param> - /// <returns>The loaded XAML</returns> - public object LoadComponent(object component, string xamlOrUri, bool uri) { - if (uri) { - return LoadComponent(component, MakeUri(xamlOrUri)); - } else { - component = XamlReader.Load(Regex.Replace(xamlOrUri, "x:Class=\".*?\"", "")); - return component; - } + public static object LoadComponent(object component, string xamlUri) { + return LoadComponent(component, MakeUri(xamlUri)); } /// <summary> @@ -185,35 +181,95 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> /// <param name="component">The object to load the XAML into</param> /// <param name="uri">relative Uri of the XAML file</param> - public new object LoadComponent(object component, Uri relativeUri) { - if (Application.GetResourceStream(relativeUri) == null) { - var xamlStream = HttpPAL.PAL.VirtualFilesystem.GetFile(relativeUri); - if (xamlStream != null) { - string xaml; - using (StreamReader sr = new StreamReader(xamlStream)) { - xaml = sr.ReadToEnd(); - } - return LoadComponent(component, xaml, false); - } + public static new object LoadComponent(object component, Uri relativeUri) { + if (relativeUri.IsAbsoluteUri || Application.GetResourceStream(relativeUri) == null) { + // XAML file is not in the XAP, so fall back to XamlReader.Load + var xaml = HttpPAL.PAL.VirtualFilesystem.GetFileContents(relativeUri); + if (xaml != null) return LoadComponentFromString(xaml); } else { Application.LoadComponent(component, relativeUri); return component; } return null; + } + + /// <summary> + /// Returns an object with the xaml string loaded + /// </summary> + /// <param name="xaml">XAML string to load</param> + /// <returns>Loaded XAML object</returns> + public static object LoadComponentFromString(string xaml) { + return XamlReader.Load(Regex.Replace(xaml, "x:Class=\".*?\"", "")); + } + #endregion + #region MakeUri + /// <summary> + /// See MakeUri(Uri, Uri) + /// </summary> + public static Uri MakeUri(string relativeUri) { + return MakeUri(null, relativeUri); + } + /// <summary> + /// See MakeUri(Uri, Uri) + /// </summary> + public static Uri MakeUri(Uri baseUri, string relativeUri) { + return MakeUri(null, new Uri(NormalizePath(relativeUri), UriKind.Relative)); } /// <summary> - /// Makes a Uri object that is relative to the location of the "start" source file. + /// See MakeUri(Uri, Uri) /// </summary> - /// <param name="relativeUri">Any relative uri</param> - /// <returns>A Uri relative to the "start" source file</returns> - public Uri MakeUri(string relativeUri) { - string baseUri = ScriptTags.HasScriptTags && Settings.EntryPoint != null ? - Path.GetDirectoryName(Settings.EntryPoint) : - ""; - if (baseUri != "") baseUri += "/"; - return new Uri(baseUri + relativeUri, UriKind.Relative); + public static Uri MakeUri(Uri relativeUri) { + return MakeUri(null, relativeUri); + } + + /// <summary> + /// Makes a Uri out of a baseUri and a relativeUri. + /// + /// If the relativeUri is actually absolute, just return it. + /// Otherwise, take the baseUri and relativeUri and try to combine + /// them. When the baseUri is null, make the baseUri the entry-point's + /// directory and try checking if the combined Uri exists in the XAP + /// file; if so return it. Otherwise, make the baseUri + /// DynamicApplication.BaseUri and return the combined Uri. The Uris + /// are "combined", by taking everything but the filename of the + /// baseUri and tacking the relativeUri onto the end. + /// </summary> + public static Uri MakeUri(Uri baseUri, Uri relativeUri) { + if (!relativeUri.IsAbsoluteUri) { + if (baseUri == null) { + baseUri = new Uri( + Settings.EntryPoint == null ? + string.Empty : + NormalizePath(Path.GetDirectoryName(Settings.EntryPoint)), + UriKind.Relative + ); + } + var testUri = MakeUriHelper(baseUri, relativeUri); + if (!baseUri.IsAbsoluteUri && !XapPAL.PAL.FileExists(testUri.ToString())) { + return MakeUriHelper(DynamicApplication.BaseUri, relativeUri); + } + return testUri; + } + return relativeUri; + } + + private static Uri MakeUriHelper(Uri baseUri, Uri relativeUri) { + if (baseUri.IsAbsoluteUri) { + return new Uri(baseUri, relativeUri); + } else if (baseUri.ToString().Trim().Length == 0) { + return relativeUri; + } else { + return new Uri(NormalizePath(Path.Combine( + Path.GetDirectoryName(baseUri.ToString()), + relativeUri.ToString() + )), UriKind.Relative); + } + } + + private static string NormalizePath(string path) { + return BrowserVirtualFilesystem.Normalize(path); } #endregion @@ -229,7 +285,7 @@ namespace Microsoft.Scripting.Silverlight { _Current = this; _UIThreadId = Thread.CurrentThread.ManagedThreadId; - BaseUri = HtmlPage.Document.DocumentUri; + _HtmlPageUri = HtmlPage.Document.DocumentUri; Settings.ReportUnhandledErrors = true; @@ -251,6 +307,7 @@ namespace Microsoft.Scripting.Silverlight { Engine = new DynamicEngine(); if (Settings.ConsoleEnabled) Repl.Show(); + LanguageTypeExtensions.Load(Engine.LangConfig); ScriptTags.Run(Engine); Engine.Run(Settings.EntryPoint); }); @@ -279,6 +336,25 @@ namespace Microsoft.Scripting.Silverlight { args.Handled = true; ErrorFormatter.DisplayError(Settings.ErrorTargetID, args.ExceptionObject); } + + /// <summary> + /// Get a resource out of the current assembly + /// </summary> + /// <param name="filename">name of the resource</param> + /// <returns>The string contents of the resource</returns> + internal static string GetResource(string filename) { + var stream = GetManifestResourceStream(filename); + if (stream == null) return null; + var textStreamReader = new StreamReader(stream); + var result = textStreamReader.ReadToEnd(); + textStreamReader.Close(); + return result; + } + + internal static Stream GetManifestResourceStream(string filename) { + return Assembly.GetExecutingAssembly().GetManifestResourceStream("Microsoft.Scripting.Silverlight." + filename); + } + #endregion } } Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/DynamicApplication.cs @@ -59,6 +59,10 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> public ScriptScope EntryPointScope { get; private set; } + /// <summary> + /// true while the entry-point is running, false otherwise + /// </summary> + internal bool RunningEntryPoint { get; set; } /// <summary> /// Finds the avaliable languages, initializes the ScriptRuntime, @@ -70,6 +74,7 @@ namespace Microsoft.Scripting.Silverlight { /// Initializes the languages, ScriptRuntime, and entry-point ScriptScope. /// </summary> public DynamicEngine(DynamicLanguageConfig langConfig) { + RunningEntryPoint = false; if (langConfig == null) { InitializeLangConfig(); } else { @@ -95,10 +100,19 @@ namespace Microsoft.Scripting.Silverlight { /// globals and modules. /// </summary> private void InitializeScope() { - EntryPointScope = Runtime.CreateScope(); - EntryPointScope.SetVariable("document", new DynamicHtmlDocument()); - EntryPointScope.SetVariable("window", new DynamicHtmlObject(HtmlPage.Window)); - EntryPointScope.SetVariable("me", DynamicApplication.Current.RootVisual); + EntryPointScope = CreateScope(); + } + + /// <summary> + /// Creates a new scope, adding any convenience globals and modules. + /// </summary> + public ScriptScope CreateScope() { + var scope = Runtime.CreateScope(); + scope.SetVariable("document", HtmlPage.Document); + scope.SetVariable("window", HtmlPage.Window); + scope.SetVariable("me", DynamicApplication.Current.RootVisual); + scope.SetVariable("xaml", DynamicApplication.Current.RootVisual); + return scope; } /// <summary> @@ -170,13 +184,14 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> /// <param name="entryPoint">path to the script</param> public void Run(string entryPoint) { - if (Settings.EntryPoint != null) { + if (entryPoint != null) { var vfs = ((BrowserPAL) Runtime.Host.PlatformAdaptationLayer).VirtualFilesystem; string code = vfs.GetFileContents(entryPoint); - Engine = Runtime.GetEngineByFileExtension(Path.GetExtension(Settings.EntryPoint)); - + Engine = Runtime.GetEngineByFileExtension(Path.GetExtension(entryPoint)); ScriptSource sourceCode = Engine.CreateScriptSourceFromString(code, entryPoint, SourceCodeKind.File); + RunningEntryPoint = true; sourceCode.Compile(new ErrorFormatter.Sink()).Execute(EntryPointScope); + RunningEntryPoint = false; } } } Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/DynamicEngine.cs @@ -57,7 +57,7 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> /// <param name="name">name of the language</param> /// <returns>configuration information for the language</returns> - private DynamicLanguageInfo GetLanguageByName(string name) { + public DynamicLanguageInfo GetLanguageByName(string name) { foreach (var lang in Languages) foreach (var n in lang.Names) if (n.ToLower() == name.ToLower()) Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/DynamicLanguageConfig.cs @@ -29,26 +29,25 @@ namespace Microsoft.Scripting.Silverlight { public class DynamicScriptTags { /// <summary> - /// Inline strings and external URIs for a unique language/defer-status combination. + /// Inline strings and external URIs for script-tag registered + /// to this control. /// </summary> public class ScriptCode { public string Language { get; private set; } public bool Defer { get; private set; } - public List<string> Inline { get; private set; } - public List<Uri> External { get; private set; } + public string Inline { get; set; } + public Uri External { get; set; } public ScriptCode(string lang, bool defer) { Language = lang; Defer = defer; - Inline = new List<string>(); - External = new List<Uri>(); } } /// <summary> - /// Dictionary of language-name(string) => (Dictionary of defer-status(bool) => ScriptCode) + /// Script code registered for this Silverlight control /// </summary> - public Dictionary<string, Dictionary<bool, ScriptCode>> Code { get; private set; } + public List<ScriptCode> Code { get; private set; } /// <summary> /// Holds onto the language config @@ -56,12 +55,18 @@ namespace Microsoft.Scripting.Silverlight { private DynamicLanguageConfig _LangConfig; /// <summary> + /// true while the script-tag is running, false otherwise + /// </summary> + internal bool RunningScriptTags; + + /// <summary> /// Given a language config it processes the script-tags on the HTML /// page (see "GetScriptTags"). /// </summary> public DynamicScriptTags(DynamicLanguageConfig langConfig) { + RunningScriptTags = false; _LangConfig = langConfig; - Code = new Dictionary<string, Dictionary<bool, ScriptCode>>(); + Code = new List<ScriptCode>(); GetScriptTags(); } @@ -92,21 +97,15 @@ namespace Microsoft.Scripting.Silverlight { _LangConfig.LanguagesUsed[language] = true; - if (!Code.ContainsKey(type) || Code[type] == null) { - Code[type] = new Dictionary<bool, ScriptCode>(); - } - if (!Code[type].ContainsKey(defer) || Code[type][defer] == null) { - var sc = new ScriptCode(language, defer); - Code[type][defer] = sc; - } - + var sc = new ScriptCode(language, defer); if (src != null) { - Code[type][defer].External.Add(MakeUriAbsolute(new Uri(src, UriKind.RelativeOrAbsolute))); + sc.External = DynamicApplication.MakeUri(src); } else { var innerHtml = (string)e.GetProperty("innerHTML"); if (innerHtml != null) - Code[type][defer].Inline.Add(RemoveMargin(innerHtml)); + sc.Inline = RemoveMargin(innerHtml); } + Code.Add(sc); } } @@ -117,9 +116,9 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> public void DownloadExternalCode(Action onComplete) { var externalUris = new List<Uri>(); - foreach (var pair1 in Code) - foreach(var pair2 in pair1.Value) - externalUris.AddRange(pair2.Value.External); + foreach (var sc in Code) + if(sc.External != null) + externalUris.Add(sc.External); ((HttpVirtualFilesystem)HttpPAL.PAL.VirtualFilesystem). DownloadAndCache(externalUris, onComplete); } @@ -129,13 +128,9 @@ namespace Microsoft.Scripting.Silverlight { /// </summary> public bool HasScriptTags { get { - foreach (var i in Code) { - foreach (var j in i.Value) { - if (j.Value.Inline.Count > 0) { - return true; - } - } - } + foreach (var i in Code) + if (i.External != null && i.Inline != null) + return true; return false; } } @@ -144,35 +139,35 @@ namespace Microsoft.Scripting.Silverlight { /// Runs the registered script tags against the DynamicEngine. /// </summary> public void Run(DynamicEngine engine) { - foreach (var pair in Code) { - var lang = pair.Key; - engine.Engine = _LangConfig.GetEngine(GetLanguageNameFrom(pair.Key)); - if (engine.Engine != null) { - foreach (var pair2 in pair.Value) { - var defer = pair2.Key; - var scripts = pair2.Value; - if (!defer) { - foreach (var uri in scripts.External) { - var code = BrowserPAL.PAL.VirtualFilesystem.GetFileContents(uri); - if (code == null) continue; - ScriptSource externalSourceCode = - engine.Engine.CreateScriptSourceFromString( - code, - uri.AbsoluteUri, - SourceCodeKind.File - ); - externalSourceCode.Compile(new ErrorFormatter.Sink()).Execute(engine.EntryPointScope); - } - foreach (var code in scripts.Inline) { - ScriptSource inlineSourceCode = - engine.Engine.CreateScriptSourceFromString( - code, - HtmlPage.Document.DocumentUri.LocalPath.Remove(0, 1), - SourceCodeKind.File - ); - inlineSourceCode.Compile(new ErrorFormatter.Sink()).Execute(engine.EntryPointScope); - } - } + var inlineScope = engine.CreateScope(); + foreach (var sc in Code) { + engine.Engine = _LangConfig.GetEngine(sc.Language); + if (engine.Engine != null && !sc.Defer) { + ScriptSource sourceCode = null; + ScriptScope scope = null; + if(sc.External != null) { + var code = BrowserPAL.PAL.VirtualFilesystem.GetFileContents(sc.External); + if (code == null) continue; + sourceCode = + engine.Engine.CreateScriptSourceFromString( + code, + sc.External.AbsoluteUri, + SourceCodeKind.File + ); + scope = engine.CreateScope(); + } else if (sc.Inline != null) { + sourceCode = + engine.Engine.CreateScriptSourceFromString( + sc.Inline, + DynamicApplication.BaseUri.LocalPath.Remove(0, 1), + SourceCodeKind.File + ); + scope = inlineScope; + } + if (sourceCode != null && scope != null) { + RunningScriptTags = true; + sourceCode.Compile(new ErrorFormatter.Sink()).Execute(scope); + RunningScriptTags = false; } } } @@ -278,30 +273,6 @@ namespace Microsoft.Scripting.Silverlight { } /// <summary> - /// Makes the URI absolute (if it isn't already) against the HTML page. - /// </summary> - private Uri MakeUriAbsolute(Uri uri) { - Uri referenceUri = HtmlPage.Document.DocumentUri; - if (!uri.IsAbsoluteUri) { - - // Is this a direcory name? - Uri baseUri = null; - if (Path.GetExtension(referenceUri.AbsoluteUri) == "") { - // yes, so just use the directory - baseUri = referenceUri; - } else { - // no, so strip off the filename - var slashIndex = referenceUri.AbsoluteUri.LastIndexOf('/'); - baseUri = new Uri(referenceUri.AbsoluteUri.Substring(0, slashIndex + 1), UriKind.Absolute); - } - - return new Uri(baseUri, uri); - } else { - return uri; - } - } - - /// <summary> /// Is the given "languageName" represented by a avaliable language? /// </summary> public bool LanguageFound(string languageName) { Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/DynamicScriptTags.cs @@ -27,6 +27,29 @@ using System.Dynamic; namespace Microsoft.Scripting.Silverlight { + #region Run code to load language-specific type extensions + public static class LanguageTypeExtensions { + public static void Load(DynamicLanguageConfig langConfig) { + foreach (var pair in langConfig.LanguagesUsed) { + if (pair.Value) { + var lang = langConfig.GetLanguageByName(pair.Key); + LanguageTypeExtensions.LoadByExtension(lang.Extensions[0]); + } + } + } + + public static void LoadByExtension(string fileExtension) { + var path = string.Format("init{0}", fileExtension); + var code = DynamicApplication.GetResource(path); + if (code == null) return; + var dyneng = DynamicApplication.Current.Engine; + dyneng.Engine = dyneng.Runtime.GetEngineByFileExtension(fileExtension); + dyneng.Engine.CreateScriptSourceFromString(code, path).Execute(dyneng.CreateScope()); + } + } + #endregion + + #region Extension classes that support Microsoft.Scripting.Runtime.ExtensionTypeAttribute /// <summary> /// Injects properties into the HtmlDocument object for each element ID /// </summary> @@ -70,97 +93,5 @@ namespace Microsoft.Scripting.Silverlight { return result; } } - - /// <summary> - /// Dynamic HtmlDocument - /// </summary> - public class DynamicHtmlDocument : DynamicHtmlObject { - public DynamicHtmlDocument() { - StaticObject = HtmlPage.Document; - } - - public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { - HtmlElement element = ((HtmlDocument)StaticObject).GetElementById(binder.Name); - if (element == null) { - return base.TryInvokeMember(binder, args, out result); - } - result = new DynamicHtmlObject(element); - return true; - } - - public override bool TryGetMember(GetMemberBinder binder, out object result) { - HtmlElement element = ((HtmlDocument)StaticObject).GetElementById(binder.Name); - if (element == null) { - return base.TryGetMember(binder, out result); - } - result = new DynamicHtmlObject(element); - return true; - } - } - - /// <summary> - /// Dynamic HtmlObject - /// </summary> - public class DynamicHtmlObject : DynamicScriptObject { - public DynamicHtmlObject() { } - public DynamicHtmlObject(HtmlObject obj) { - StaticObject = obj; - } - - public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { - try { - var obj = StaticObject.Invoke(binder.Name, args); - result = new DynamicScriptObject((ScriptObject)obj); - return true; - } catch (InvalidOperationException) { - return base.TryInvokeMember(binder, args, out result); - } - } - - public override bool TryGetMember(GetMemberBinder binder, out object result) { - try { - var obj = StaticObject.Invoke(binder.Name); - result = new DynamicScriptObject((ScriptObject)obj); - return true; - } catch (InvalidOperationException) { - return base.TryGetMember(binder, out result); - } - } - - public override bool TryInvoke(InvokeBinder binder, object[] args, out object result) { - return base.TryInvoke(binder, args, out result); - } - } - - /// <summary> - /// Dynamic ScriptObject - /// </summary> - public class DynamicScriptObject : DynamicObject { - public ScriptObject StaticObject { get; protected set; } - - public DynamicScriptObject() { } - public DynamicScriptObject(ScriptObject so) { - StaticObject = so; - } - - public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { - try { - var opts = DynamicApplication.Current.Engine.Engine.Operations; - result = opts.InvokeMember(StaticObject, binder.Name, args); - return true; - } catch { - return base.TryInvokeMember(binder, args, out result); - } - } - - public override bool TryGetMember(GetMemberBinder binder, out object result) { - try { - var opts = DynamicApplication.Current.Engine.Engine.Operations; - result = opts.GetMember(StaticObject, binder.Name); - return true; - } catch { - return base.TryGetMember(binder, out result); - } - } - } -} + #endregion +} \ No newline at end of file Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/ExtensionTypes.cs @@ -16,11 +16,10 @@ <AssemblyOriginatorKeyFile>..\..\..\Support\MSSharedLibKey.snk</AssemblyOriginatorKeyFile> <SignAssembly Condition="'$(SignAssembly)' == '' And Exists('$(AssemblyOriginatorKeyFile)')">true</SignAssembly> <SignedSym Condition="'$(SignAssembly)' == 'true'">SIGNED</SignedSym> - <DelaySign>true</DelaySign> + <DelaySign>true</DelaySign> <SilverlightBuild>true</SilverlightBuild> <Silverlight3Path>..\..\..\Utilities\Silverlight\x86ret</Silverlight3Path> <Silverlight4Path>..\..\..\Utilities\Silverlight\v4-x86fre</Silverlight4Path> - <!-- The following two lines prevent csc.rsp and Microsoft.NETFramework.props from adding additional assembly references --> <NoConfig>true</NoConfig> <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> @@ -161,6 +160,9 @@ <EmbeddedResource Include="agdlr.css" /> <EmbeddedResource Include="agdlr.js" /> </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="init.rb" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition=" '$(SilverlightTreeBuild)' != 'true' " /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. @@ -173,4 +175,4 @@ <PostBuildEvent> </PostBuildEvent> </PropertyGroup> -</Project> +</Project> \ No newline at end of file Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Microsoft.Scripting.Silverlight.csproj @@ -114,7 +114,7 @@ namespace Microsoft.Scripting.Silverlight { ScriptScope scope = DynamicApplication.Current.Engine.EntryPointScope; if (scope == null) { - scope = engine.CreateScope(); + scope = DynamicApplication.Current.Engine.CreateScope(); } return Show(engine, scope); Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Repl.cs @@ -164,7 +164,7 @@ namespace Microsoft.Scripting.Silverlight { var block = HtmlPage.Document.CreateElement(tagName); block.SetAttribute("type", mimeType); - string scriptOrStyle = GetResource(filename); + string scriptOrStyle = DynamicApplication.GetResource(filename); var ieScriptOrStyleSet = false; @@ -189,14 +189,6 @@ namespace Microsoft.Scripting.Silverlight { return HtmlPage.Document.GetElementsByTagName("head")[0] as HtmlElement; } - private string GetResource(string filename) { - var assembly = Assembly.GetExecutingAssembly(); - var textStreamReader = new StreamReader(assembly.GetManifestResourceStream("Microsoft.Scripting.Silverlight." + filename)); - var result = textStreamReader.ReadToEnd(); - textStreamReader.Close(); - return result; - } - private string WindowHtml() { return string.Format(_htmlTemplate, _windowId, _windowMenuId, _windowLinkId); } Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Window.cs @@ -57,20 +57,8 @@ namespace Microsoft.Scripting.Silverlight { } xaml = w.ToString(); - // Find the root XAML node, create the corresponding Control - // object, and set the RootVisual with the XAML string. - XmlReader reader = XmlReader.Create(new StringReader(xaml)); - reader.MoveToContent(); - if (reader.NodeType == XmlNodeType.Element) { - var aqn = typeof(System.Windows.Controls.UserControl).AssemblyQualifiedName; - var type = Type.GetType( - string.Format("System.Windows.Controls.{0}, {1}", reader.Name, aqn.Substring(aqn.IndexOf(',') + 1)) - ); - if(type != null) { - var root = (UIElement) type.GetConstructor(new Type[] { }).Invoke(new object[] { }); - DynamicApplication.Current.LoadRootVisual(root, xaml, false); - } - } + // set the RootVisual + DynamicApplication.Current.LoadRootVisualFromString(xaml); }; // If src is set, download the src and invoke onComplete when the Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/XamlScriptTags.cs 01bd6c601e3f5066860231bc5b13a1b3284392ae Jim Deville jdeville@microsoft.com http://github.com/shri/ironruby/commit/abdb2564bd050a5c37bd7976ccb52e71052265a1 abdb2564bd050a5c37bd7976ccb52e71052265a1 2009-10-28T08:43:12-07:00 2009-10-28T08:43:12-07:00 reverting accidental undoing of Jimmy's SL changes 811cb616796ffe79e185013b3e6eff54e7a17062 Jim Deville jdeville@microsoft.com