Add InterpreterWrapper.boo.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@618 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/Boo.InterpreterAddIn.booproj

@@ -33,6 +33,7 @@
     <Compile Include="CodeCompletionData.boo" />
     <Compile Include="InteractiveInterpreterControl.boo" />
     <Compile Include="InterpreterPad.boo" />
+    <Compile Include="InterpreterWrapper.boo" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">

src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/InteractiveInterpreterControl.boo

@@ -133,8 +133,8 @@ class InteractiveInterpreterControl(TextEditorControl):
 	_block = System.IO.StringWriter()
 	
 	[getter(Interpreter)]
-	_interpreter as Boo.Lang.Interpreter.InteractiveInterpreter
+	_interpreter = InterpreterWrapper()
-
+	
 	_codeCompletionWindow as CodeCompletionWindow
 	
 	[property(CompletionWindowImageProvider, value is not null)]
@@ -148,10 +148,8 @@ class InteractiveInterpreterControl(TextEditorControl):
 	_blockKeys = false
 	
 	def constructor():
-		self._interpreter = Boo.Lang.Interpreter.InteractiveInterpreter(
+		self._interpreter.LinePrinted += self.print
-								RememberLastValue: true,
+		self._interpreter.Cleared += self.cls
-								Print: self.print)
-		self._interpreter.SetValue("cls", cls)
 		self._lineHistory = LineHistory(CurrentLineChanged: _lineHistory_CurrentLineChanged)
 		self.Document.HighlightingStrategy = GetBooHighlighting()
 		self.EnableFolding =  false
@@ -178,19 +176,19 @@ class InteractiveInterpreterControl(TextEditorControl):
 		
 	def Eval(code as string):
 		try:
-			_interpreter.LoopEval(code)			
+			_interpreter.RunCommand(code)			
 		ensure:
 			_state = InputState.SingleLine
-		
+	
 	private def ConsumeCurrentLine():		
 		text as string = CurrentLineText # was accessing Control.text member
 		_lineHistory.Add(text)
 		print("")
 		return text
-		
+	
 	private def GetLastLineSegment():
 		return self.Document.GetLineSegment(self.Document.LineSegmentCollection.Count)
-		
+	
 	private def SingleLineInputState():
 		code = ConsumeCurrentLine()
 		if code[-1:] in ":", "\\":
@@ -199,39 +197,39 @@ class InteractiveInterpreterControl(TextEditorControl):
 			_block.WriteLine(code)
 		else:
 			Eval(code)
-			
+	
 	private def BlockInputState():
 		code = ConsumeCurrentLine()
 		if 0 == len(code):
-			Eval(_block.ToString())			
+			Eval(_block.ToString())
 		else:
 			_block.WriteLine(code)
 
 	def print(msg):
-		AppendText("${msg}\r\n")		
+		AppendText("${msg}\r\n")
-				
+	
 	def prompt():
 		AppendText((">>> ", "... ")[_state])
-
+	
 	def ClearLine():
 		segment = GetLastLineSegment()
 		self.Document.Replace(segment.Offset + 4,
 			self.CurrentLineText.Length,
 			"")
-
+	
 	def AppendText(text as string):
 		segment = GetLastLineSegment()
 		self.Document.Insert(segment.Offset + segment.TotalLength, text)
 		MoveCaretToEnd()
-		
+	
 	def MoveCaretToEnd():
 		segment = GetLastLineSegment()
 		newOffset = segment.Offset + segment.TotalLength
 		MoveCaretToOffset(newOffset)
-		
+	
 	def MoveCaretToOffset(offset as int):
 		self.ActiveTextAreaControl.Caret.Position = self.Document.OffsetToPosition(offset)
-
+	
 	override def InitializeTextAreaControl(newControl as TextAreaControl):
 		super(newControl)
 		newControl.TextArea.DoProcessDialogKey += HandleDialogKey
@@ -332,8 +330,3 @@ class InteractiveInterpreterControl(TextEditorControl):
 		
 	def GetBooHighlighting():
 		return HighlightingManager.Manager.FindHighlighter("Boo")
-		
-	static def InstallDefaultSyntaxModeProvider():
-		HighlightingManager.Manager.AddSyntaxModeFileProvider(
-			FileSyntaxModeProvider(Path.GetDirectoryName(Application.ExecutablePath)))
-

src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/InterpreterWrapper.boo

@@ -0,0 +1,35 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt">2005 AlphaSierraPapa</copyright>
+//     <license see="prj:///doc/license.txt">GNU General Public License</license>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision$</version>
+// </file>
+
+namespace Boo.InterpreterAddIn
+
+import System
+import System.Windows.Forms
+
+class InterpreterWrapper:
+	_interpreter as Boo.Lang.Interpreter.InteractiveInterpreter
+	
+	def constructor():
+		_interpreter = Boo.Lang.Interpreter.InteractiveInterpreter(
+								RememberLastValue: true,
+								Print: self.OnPrintLine)
+		_interpreter.SetValue("cls", { Cleared() })
+	
+	event LinePrinted as callable(string)
+	event Cleared as MethodInvoker
+	
+	private def OnPrintLine(text as string):
+		LinePrinted(text)
+	
+	def RunCommand(code as string):
+		_interpreter.LoopEval(code)
+	
+	def SuggestCodeCompletion(code as string):
+		// David: the code completion items have to be passed as strings;
+		// but it's not important, you can return null if you want.
+		return _interpreter.SuggestCodeCompletion(code)
+

src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@@ -52,13 +52,6 @@
 		<CodeCompletionBinding id = "Boo" extensions = ".boo" class = "Grunwald.BooBinding.CodeCompletion.CompletionBinding"/>
 	</Path>
 	
-	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/SyntaxModes">
-		<SyntaxMode id         = "Boo Syntax Mode"
-		            name       = "Boo"
-		            extensions = ".boo"
-		            resource   = "Grunwald.BooBinding.Resources.Boo.xshd" />
-	</Path>
-	
 	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
 		<DisplayBinding id              = "BooFormDesigner"
 		                type            = "Secondary"

src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj

@@ -61,9 +61,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Boo.xshd">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
     <Compile Include="Src\AssemblyInfo.cs" />
     <Compile Include="Src\BooProject.cs" />
     <Compile Include="Src\BooLanguageBinding.cs" />

src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj

@@ -182,6 +182,7 @@
     <EmbeddedResource Include="Resources\XML-Mode.xshd" />
     <Compile Include="Src\Document\TextBufferStrategy\PieceTableTextBufferStrategy.cs" />
     <Compile Include="Src\Util\FileReader.cs" />
+    <EmbeddedResource Include="Resources\Boo.xshd" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>

src/Libraries/ICSharpCode.TextEditor/Project/Resources/SyntaxModes.xml

@@ -7,6 +7,10 @@
 	      name       = "BAT"
 	      extensions = ".bat"/>
 	
+	<Mode file       = "Boo.xshd"
+	      name       = "Boo"
+	      extensions = ".boo"/>
+	
 	<Mode file       = "Coco-Mode.xshd"
 	      name       = "Coco"
 	      extensions = ".atg"/>
@@ -45,5 +49,5 @@
 	
 	<Mode file       = "XML-Mode.xshd"
 	      name       = "XML"
-	      extensions = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets"/>
+	      extensions = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets"/>
 </SyntaxModes>

src/Libraries/ICSharpCode.TextEditor/Project/Resources/XML-Mode.xshd

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!-- syntaxdefinition for XML 2000 by Mike Krueger -->
-<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets">
+<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets">
 	
 	<Properties>
 		<Property name="BlockCommentBegin" value="&lt;!--"/>