Portfolio Properties

Fixed several small type conversion issues and added the ability to use
script libraries across multiple ObiScripts.

KimonoCore/DScript/ScriptEngine.Factor.cs

@@ -42,7 +42,7 @@ private ScriptVarLink Factor(ref bool execute)
 			}
 			if (_currentLexer.TokenType == ScriptLex.LexTypes.RFalse)
 			{
-				_currentLexer.Match(ScriptLex.LexTypes.RTrue);
+				_currentLexer.Match(ScriptLex.LexTypes.RFalse);
 				return new ScriptVarLink(new ScriptVar(0), null);
 			}
 			if (_currentLexer.TokenType == ScriptLex.LexTypes.RNull)

KimonoCore/DScript/ScriptEngine.Statement.cs

@@ -51,7 +51,7 @@ private void Statement(ref bool execute)
 			else if (_currentLexer.TokenType == ScriptLex.LexTypes.RVar)
 			{
 				//creating variables
-				//TODO: make this less shit
+				//TODO: Clean up variable generation
 
 				_currentLexer.Match(ScriptLex.LexTypes.RVar);
 

KimonoCore/DScript/ScriptEngine.cs

@@ -100,10 +100,55 @@ public void Trace()
 			Root.Trace(0, null);
 		}
 
+		private List<string> IncludedLibraries = new List<string>();
+
+		private bool LibraryIncluded(string name)
+		{
+			// Scan list of included libraries
+			foreach (string library in IncludedLibraries)
+			{
+				// Found?
+				if (library == name) return true;
+			}
+
+			// No
+			return false;
+		}
+
 		public void Execute(String code)
 		{
 			ScriptLex oldLex = _currentLexer;
-			Stack<ScriptVar> oldScopes = _scopes;
+			Stack<ScriptVar> oldScopes = _scopes;
+
+			// Preprocess script and expand any libraries if needed
+			IncludedLibraries.Clear();
+			foreach (KimonoProperty property in ObiScriptPortfolio.Portfolio.Properties)
+			{
+				// Is this a script library?
+				if (property is KimonoPropertyLibrary)
+				{
+					// Yes, see if it has been included in the current script
+					var token = $"using {property.Name};";
+
+					// Included?
+					if (code.Contains(token))
+					{
+						// Yes, is the library already included?
+						if (LibraryIncluded(property.Name))
+						{
+							// Yes, just remove this call
+							code = code.Replace(token, "");
+						}
+						else
+						{
+							// No, expand the library into this script and
+							// mark library as included
+							code = code.Replace(token, property.ObiScript);
+							IncludedLibraries.Add(property.Name);
+						}
+					}
+				}
+			}
 
 			using (_currentLexer = new ScriptLex(code))
 			{

KimonoCore/KimonoCore.projitems

@@ -85,6 +85,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)DScript\Utils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObiScript\ObiScriptEngine.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ObiScript\ObiScriptPortfolio.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Properties\KimonoPropertyLibrary.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)License.txt" />

KimonoCore/KimonoPortfolio.cs

@@ -370,6 +370,20 @@ public KimonoPropertyBoolean AddPropertyBoolean()
 			return property;
 		}
 
+		/// <summary>
+		/// Adds a new library property.
+		/// </summary>
+		/// <returns>The new `KimonoPropertyBoolean`.</returns>
+		public KimonoPropertyLibrary AddPropertyLibrary()
+		{
+			// Add property
+			var property = new KimonoPropertyLibrary();
+			AddNewProperty(property);
+
+			// Return new property
+			return property;
+		}
+
 		/// <summary>
 		/// Adds a new color property.
 		/// </summary>
@@ -1258,7 +1272,7 @@ public virtual string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLan
 					}
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Portfolios are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/KimonoSketch.cs

@@ -1909,7 +1909,7 @@ public virtual string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLan
 					}
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Sketches are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/ObiScript/ObiScriptEngine.cs

@@ -72,12 +72,12 @@ public static void Text(string text, object userData)
 		/// <returns>The boolean result from the script.</returns>
 		/// <param name="state">The boolean value to send to the property.</param>
 		/// <param name="userData">The `ScriptEngine` executing the script.</param>
-		public static void Boolean(bool state, object userData)
+		public static void Boolean(int state, object userData)
 		{
 			// Save result
 			EvaluationResult.Successful = true;
 			EvaluationResult.ErrorMessage = "";
-			EvaluationResult.Value = state;
+			EvaluationResult.Value = (state == 1);
 		}
 
 		/// <summary>

KimonoCore/ObiScript/ObiScriptPortfolio.cs

@@ -130,7 +130,7 @@ public static bool GetBoolean(string name, object userData)
 		/// <param name="name">The name of the property to set.</param>
 		/// <param name="value">The new value.</param>
 		/// <param name="userData">The `ScriptEngine` executing the script.</param>
-		public static void SetBoolean(string name, bool value, object userData)
+		public static void SetBoolean(string name, int value, object userData)
 		{
 			// Get requested property
 			var property = FindProperty(name);
@@ -140,7 +140,7 @@ public static void SetBoolean(string name, bool value, object userData)
 			{
 				// Yes, return value
 				var prop = property as KimonoPropertyBoolean;
-				prop.Value = value;
+				prop.Value = (value == 1);
 			}
 		}
 

KimonoCore/Properties/KimonoPropertyLibrary.cs

@@ -0,0 +1,88 @@
+using System;
+using SkiaSharp;
+
+namespace KimonoCore
+{
+	public class KimonoPropertyLibrary : KimonoProperty
+	{
+		#region Computed Properties
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="T:KimonoCore.KimonoProperty"/> gets value from script.
+		/// </summary>
+		/// <value><c>true</c> if gets value from script; otherwise, <c>false</c>.</value>
+		public override bool GetsValueFromScript
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="T:KimonoCore.KimonoPropertyColor"/> is obi script value.
+		/// </summary>
+		/// <value><c>true</c> if is obi script value; otherwise, <c>false</c>.</value>
+		public override bool IsObiScriptValue
+		{
+			get
+			{
+				return true;
+			}
+		}
+		#endregion
+
+		#region Constructors
+		public KimonoPropertyLibrary()
+		{
+			// Initialize
+			Name = "Script Library";
+			ObiScript = "// Add one or more ObiScript `function` definitions to this library,\n" +
+				"// then add `using library-name;` to the top of any other ObiScript to use these\n" +
+				"// functions inside of that script.";
+		}
+		#endregion
+
+		#region Public Methods
+		/// <summary>
+		/// Evaluate this instance by executing any attached Obi Script to get the new
+		/// value for the `KimonoProperty`.
+		/// </summary>
+		/// <returns>The result of the Obi Script execution as a `ObiScriptResult`.</returns>
+		public override ObiScriptResult Evaluate()
+		{
+			// Is there a script attached?
+			if (GetsValueFromScript)
+			{
+				// Execute the script to check for errors
+				ObiScriptEngine.Runtime.Execute(ObiScript);
+
+			}
+
+			// Return the result of executing the script
+			return ObiScriptEngine.EvaluationResult;
+		}
+		#endregion
+
+		#region Cloning
+		/// <summary>
+		/// Clone this instance.
+		/// </summary>
+		/// <returns>The clone.</returns>
+		public override KimonoProperty Clone()
+		{
+			// Make copy
+			var newProperty = new KimonoPropertyLibrary()
+			{
+				Name = this.Name,
+				Usage = this.Usage,
+				IsObiScriptValue = this.IsObiScriptValue,
+				GetsValueFromScript = this.GetsValueFromScript,
+				ObiScript = this.ObiScript
+			};
+
+			// Return clone
+			return newProperty;
+		}
+		#endregion
+	}
+}

KimonoCore/Properties/KimonoPropertyNumber.cs

@@ -45,10 +45,10 @@ public override ObiScriptResult Evaluate()
 				if (ObiScriptEngine.EvaluationResult.Successful)
 				{
 					// Was the right type returned?
-					if (ObiScriptEngine.EvaluationResult.Value is double || ObiScriptEngine.EvaluationResult.Value is int)
+					if (ObiScriptEngine.EvaluationResult.Value is double)
 					{
 						// Yes, save it
-						Value = (float)ObiScriptEngine.EvaluationResult.Value;
+						Value = float.Parse(ObiScriptEngine.EvaluationResult.Value.ToString());
 					}
 					else
 					{

KimonoCore/Shapes/KimonoShapeArrow.cs

@@ -578,7 +578,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeBezier.cs

@@ -713,7 +713,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeGroup.cs

@@ -1905,7 +1905,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeLine.cs

@@ -250,7 +250,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeOval.cs

@@ -258,7 +258,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapePolygon.cs

@@ -372,7 +372,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeRect.cs

@@ -259,7 +259,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeRoundRect.cs

@@ -342,7 +342,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeStar.cs

@@ -563,7 +563,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeText.cs

@@ -735,7 +735,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeTriangle.cs

@@ -269,7 +269,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Shapes/KimonoShapeVector.cs

@@ -605,7 +605,7 @@ public override string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLa
 					sourceCode += ToCSharp(outputLibrary);
 					break;
 				case CodeOutputLanguage.ObiScript:
-					// TODO: Add ObiScript output
+					sourceCode += "// Shapes are not supported in ObiScript\n";
 					break;
 			}
 

KimonoCore/Styles/KimonoColor.cs

@@ -629,10 +629,10 @@ public virtual string ToCode(CodeOutputOS outputOS, CodeOutputLanguage outputLan
 			switch (outputLanguage)
 			{
 				case CodeOutputLanguage.CSharp:
-					sourceCode += $"var {KimonoCodeGenerator.MakeElementName(Name)} = {KimonoCodeGenerator.ColorToCode(outputLibrary,Color)};";
+					sourceCode += $"var {KimonoCodeGenerator.MakeElementName(Name)} = {KimonoCodeGenerator.ColorToCode(outputLibrary,Color)};\n";
 					break;
 				case CodeOutputLanguage.ObiScript:
-					sourceCode += $"#Color({Color.Red}, {Color.Green}, {Color.Blue}, {Color.Alpha})";
+					sourceCode += $"Return.Color(\"{Name}\");\n";
 					break;
 			}
 

KimonoCore/Styles/KimonoGradient.cs

@@ -789,7 +789,7 @@ public virtual string ToObiScript()
 
 			// Generate code
 			sourceCode = "// Obi Script Selector for this gradient\n";
-			sourceCode += $"[gradient:{Name}]";
+			sourceCode += $"Return.Gradient(\"{Name}\");\n";
 
 			// Return results
 			return sourceCode;

KimonoCore/Styles/KimonoStyle.cs

@@ -1350,7 +1350,7 @@ public virtual string ToObiScript()
 
 			// Generate code
 			sourceCode = "// Obi Script Selector for this style\n";
-			sourceCode += $"[style:{Name}]";
+			sourceCode += $"Return.Style(\"{Name}\");\n";
 
 			// Return results
 			return sourceCode;