Pd-cvs March 2006

pd-cvs@lists.iem.at

16 participants
280 discussions

externals/clr/external AssemblyInfo.cs, 1.2, NONE Counter.cs, 1.5, NONE README.txt, 1.1, NONE external.csproj, 1.6, NONE external.sln, 1.1, NONE
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/external In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/clr/external Removed Files: AssemblyInfo.cs Counter.cs README.txt external.csproj external.sln Log Message: restructured project (MSVC can't cope well with folder/classname mismatch) search for CLR DLLs in PD path first steps to efficient method handling --- external.csproj DELETED --- --- Counter.cs DELETED --- --- README.txt DELETED --- --- external.sln DELETED --- --- AssemblyInfo.cs DELETED ---

1 0

externals/clr/pd AssemblyInfo.cs, 1.3, NONE Atom.cs, 1.6, NONE PureData.cs, 1.4, NONE README.txt, 1.1, NONE pd.csproj, 1.3, NONE pd.sln, 1.1, NONE
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/clr/pd Removed Files: AssemblyInfo.cs Atom.cs PureData.cs README.txt pd.csproj pd.sln Log Message: restructured project (MSVC can't cope well with folder/classname mismatch) search for CLR DLLs in PD path first steps to efficient method handling --- pd.sln DELETED --- --- Atom.cs DELETED --- --- pd.csproj DELETED --- --- AssemblyInfo.cs DELETED --- --- PureData.cs DELETED --- --- README.txt DELETED ---

1 0

externals/clr/PureData AssemblyInfo.cs, NONE, 1.1 Atom.cs, NONE, 1.1 PureData.cs, NONE, 1.1 PureData.csproj, NONE, 1.1 README.txt, NONE, 1.1
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/PureData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/clr/PureData Added Files: AssemblyInfo.cs Atom.cs PureData.cs PureData.csproj README.txt Log Message: restructured project (MSVC can't cope well with folder/classname mismatch) search for CLR DLLs in PD path first steps to efficient method handling --- NEW FILE: PureData.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{0015D5E7-B0FB-4F06-B334-225447D1F992}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "PureData" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "PureData" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "true" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "bin\Debug\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "true" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "bin\Release\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.XML" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "Atom.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "PureData.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject> --- NEW FILE: PureData.cs --- using System; using System.Runtime.CompilerServices; // for extern import using System.Runtime.InteropServices; // for structures namespace PureData { // PD core functions public unsafe class Internal { [MethodImplAttribute (MethodImplOptions.InternalCall)] internal extern static void *SymGen(string sym); [MethodImplAttribute (MethodImplOptions.InternalCall)] internal extern static string SymEval(void *sym); } // This is the base class for a PD/CLR external public unsafe class External { // PD object pointer private readonly void *ptr; // -------------------------------------------------------------------------- [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Post(string message); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void PostError(string message); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void PostBug(string message); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void PostVerbose(string message); // -------------------------------------------------------------------------- protected delegate void MethodBang(); protected delegate void MethodFloat(float f); protected delegate void MethodSymbol(Symbol s); protected delegate void MethodPointer(Pointer p); protected delegate void MethodList(AtomList lst); protected delegate void MethodAnything(Symbol tag,AtomList lst); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodBang m); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodFloat m); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodSymbol m); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodPointer m); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodList m); [MethodImplAttribute (MethodImplOptions.InternalCall)] protected extern static void Add(MethodAnything m); } } --- NEW FILE: Atom.cs --- using System; using System.Runtime.InteropServices; // for structures using System.Collections; #if NET_2_0 using System.Collections.Generic; #endif namespace PureData { [StructLayout (LayoutKind.Sequential)] public unsafe struct Symbol { // this should NOT be public (or at least read only) private readonly void *sym; public Symbol(string s) { sym = Internal.SymGen(s); } public override string ToString() { return Internal.SymEval(sym); } } [StructLayout (LayoutKind.Sequential)] public unsafe struct Pointer { private readonly void *ptr; public override string ToString() { if(sizeof(void *) == 4) return ((int)ptr).ToString(); else return ((long)ptr).ToString(); } } [StructLayout (LayoutKind.Sequential)] public unsafe struct Atom { private enum AtomType {Null = 0, Float = 1, Symbol = 2, Pointer = 3}; [StructLayout (LayoutKind.Explicit)] private struct Word { [FieldOffset(0)] public float w_float; [FieldOffset(0)] public Symbol w_sym; [FieldOffset(0)] public Pointer w_ptr; } private AtomType type; private Word word; public Atom(float f) { type = AtomType.Float; word = new Word(); word.w_float = f; } public Atom(int i) { type = AtomType.Float; word = new Word(); word.w_float = (float)i; } public Atom(Symbol s) { type = AtomType.Symbol; word = new Word(); word.w_sym = s; } public Atom(string s) { type = AtomType.Symbol; word = new Word(); word.w_sym = new Symbol(s); } public Atom(Pointer p) { type = AtomType.Pointer; word = new Word(); word.w_ptr = p; } public bool IsFloat { get { return type == AtomType.Float; } } public bool IsSymbol { get { return type == AtomType.Symbol; } } public bool IsPointer { get { return type == AtomType.Pointer; } } public float ToFloat() { if(IsFloat) return word.w_float; else throw new System.InvalidCastException("Can't be cast to float."); } public Symbol ToSymbol() { if(IsSymbol) return word.w_sym; else throw new System.InvalidCastException("Can't be cast to Symbol."); } public Pointer ToPointer() { if(IsPointer) return word.w_ptr; else throw new System.InvalidCastException("Can't be cast to Pointer."); } override public string ToString() { if(IsFloat) return word.w_float.ToString(); else if(IsSymbol) return word.w_sym.ToString(); else if(IsPointer) return word.w_ptr.ToString(); else // should never happen throw new System.InvalidProgramException("Internal error."); } public static explicit operator float(Atom a) { return a.ToFloat(); } public static explicit operator Symbol(Atom a) { return a.ToSymbol(); } public static explicit operator Pointer(Atom a) { return a.ToPointer(); } } public class AtomListEnum : IEnumerator { public AtomList list; // Enumerators are positioned before the first element // until the first MoveNext() call. int position = -1; public AtomListEnum(AtomList l) { list = l; } public bool MoveNext() { return ++position < list.Count; } public void Reset() { position = -1; } public object Current { get { try { return list[position]; } catch (IndexOutOfRangeException) { throw new InvalidOperationException(); } } } } // attention: this is dangerous, because we could do the following // AtomList l2 = l; // with l also being an AtomList... the two private memebers will get copied, although atoms is only a temporary reference [StructLayout (LayoutKind.Sequential)] unsafe public struct AtomList #if NET_2_0 : ICollection<Atom> #else : ICollection #endif { private readonly int len; private readonly Atom *atoms; public int Count { get { return len; } } #if NET_2_0 public bool IsReadOnly { get { return false; } } // member of generic.ICollection<Atom> (C# 2.0) #endif public bool IsSynchronized { get { return false; } } public Object SyncRoot { get { return null; } } // protect this from being used private AtomList(AtomList a) { len = 0; atoms = null; } #if NET_2_0 public void CopyTo(Atom[] array,int start) #else public void CopyTo(Array array,int start) #endif { if(len > array.GetUpperBound(0)+1-start) throw new System.ArgumentException("Destination array is not long enough."); int i; for(i = 0; i < len-start; ++i) array.SetValue(atoms[start+i],i); } public IEnumerator GetEnumerator() { return new AtomListEnum(this); } public Atom this[int i] { get { if(i < 0 || i >= len) throw new System.IndexOutOfRangeException("Index outside array bounds."); return atoms[i]; } set { if(i < 0 || i >= len) throw new System.IndexOutOfRangeException("Index outside array bounds."); atoms[i] = value; } } #if !NET_2_0 public static explicit operator Atom[](AtomList l) { Atom[] ret = new Atom[l.Count]; int i; for(i = 0; i < l.Count; ++i) ret[i] = l.atoms[i]; return ret; } #endif override public string ToString() { string n = "{"; if(len > 0) { int i; for(i = 0; i < len-1; ++i) n += atoms[i].ToString()+","; n += atoms[i].ToString(); } return n+"}"; } } } --- NEW FILE: README.txt --- to compile PureData.dll execute this command: mcs Atom.cs pd.cs -out:PureData.dll -target:library --- NEW FILE: AssemblyInfo.cs --- using System.Reflection; using System.Runtime.CompilerServices; // // Le informazioni generali relative a un assembly sono controllate dal seguente // insieme di attributi. Per modificare le informazioni associate a un assembly // occorre quindi modificare i valori di questi attributi. // [assembly: AssemblyTitle("PureData")] [assembly: AssemblyDescription("bridge between C sharp externals and pd")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("")] [assembly: AssemblyCopyright("Davide Morelli, Thomas Grill")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // // Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori: // // Numero di versione principale // Numero di versione secondario // Numero revisione // Numero build // // È possibile specificare tutti i valori o impostare come predefiniti i valori Numero revisione e Numero build // utilizzando l'asterisco (*) come illustrato di seguito: [assembly: AssemblyVersion("1.0.*")] // // Per firmare l'assembly è necessario specificare una chiave da utilizzare. // Fare riferimento alla documentazione di Microsoft .NET Framework per ulteriori informazioni sulla firma degli assembly. // // Utilizzare gli attributi elencati di seguito per verificare la chiave utilizzata per la firma. // // Note: // (*) Se non è specificata alcuna chiave, non sarà possibile firmare l'assembly. // (*) KeyName fa riferimento a una chiave installata nel provider di servizi di // crittografia (CSP) sul computer in uso. KeyFile fa riferimento a un file che contiene // una chiave. // (*) Se entrambi i valori KeyFile e KeyName sono specificati, si // verificherà il seguente processo: // (1) Se KeyName è presente in CSP, verrà utilizzata tale chiave. // (2) Se KeyName non esiste e KeyFile esiste, la chiave // di KeyFile verrà installata nel CSP e utilizzata. // (*) Per creare un KeyFile, è possibile utilizzare l'utilità sn.exe (Strong Name). // Quando si specifica il KeyFile, il percorso dovrà essere // relativo alla directory di output del progetto, ovvero // %Project Directory%\obj\<configuration>. Se ad esempio il KeyFile si // trova nella directory del progetto, occorre specificare l'attributo AssemblyKeyFile // come [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] // (*) La firma ritardata è un'opzione avanzata. Vedere la documentazione di Microsoft // .NET Framework per ulteriori informazioni. // [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")]

1 0

[PD-cvs] externals/clr/Counter AssemblyInfo.cs, NONE, 1.1 Counter.cs, NONE, 1.1 Counter.csproj, NONE, 1.1 README.txt, NONE, 1.1
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/Counter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/clr/Counter Added Files: AssemblyInfo.cs Counter.cs Counter.csproj README.txt Log Message: restructured project (MSVC can't cope well with folder/classname mismatch) search for CLR DLLs in PD path first steps to efficient method handling --- NEW FILE: Counter.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{8CFEFB15-2A72-45B5-BC99-3BAFFB2B27C3}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "Counter" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "Counter" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "bin\Debug\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "bin\Release\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.XML" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> <Reference Name = "PureData" Project = "{0015D5E7-B0FB-4F06-B334-225447D1F992}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "Counter.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject> --- NEW FILE: Counter.cs --- using System; /// <summary> /// Descrizione di riepilogo per Counter. /// </summary> public class Counter: PureData.External { public Counter(PureData.AtomList args) { Post("Count.ctor "+args.ToString()); // pd.AddInlet(x, "init", ParametersType.Float); // pd.AddOutlet(x, ParametersType.Float); } // this function MUST exist private static void Setup(Counter obj) { Add(new MethodBang(obj.MyBang)); Add(new MethodFloat(obj.MyFloat)); Add(new MethodSymbol(obj.MySymbol)); Add(new MethodList(obj.MyList)); Post("Count.Main"); } protected virtual void MyBang() { Post("Count-BANG"); } protected virtual void MyFloat(float f) { Post("Count-FLOAT "+f.ToString()); } protected virtual void MySymbol(PureData.Symbol s) { Post("Count-SYMBOL "+s.ToString()); } protected virtual void MyList(PureData.AtomList l) { Post("Count-LIST "+l.ToString()); } /* public void SendOut() { pd.SendToOutlet(x, 0, new Atom(curr)); } public void Sum(float f) { curr += (int) f; pd.SendToOutlet(x, 0, new Atom(curr)); } */ } --- NEW FILE: README.txt --- to compile External.dll put PureData.dll in this folder then execute this command: mcs External.cs Counter.cs -out:External.dll -target:library -r:PureData.dll --- NEW FILE: AssemblyInfo.cs --- using System.Reflection; using System.Runtime.CompilerServices; // // Le informazioni generali relative a un assembly sono controllate dal seguente // insieme di attributi. Per modificare le informazioni associate a un assembly // occorre quindi modificare i valori di questi attributi. // [assembly: AssemblyTitle("")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // // Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori: // // Numero di versione principale // Numero di versione secondario // Numero revisione // Numero build // // È possibile specificare tutti i valori o impostare come predefiniti i valori Numero revisione e Numero build // utilizzando l'asterisco (*) come illustrato di seguito: [assembly: AssemblyVersion("1.0.*")] // // Per firmare l'assembly è necessario specificare una chiave da utilizzare. // Fare riferimento alla documentazione di Microsoft .NET Framework per ulteriori informazioni sulla firma degli assembly. // // Utilizzare gli attributi elencati di seguito per verificare la chiave utilizzata per la firma. // // Note: // (*) Se non è specificata alcuna chiave, non sarà possibile firmare l'assembly. // (*) KeyName fa riferimento a una chiave installata nel provider di servizi di // crittografia (CSP) sul computer in uso. KeyFile fa riferimento a un file che contiene // una chiave. // (*) Se entrambi i valori KeyFile e KeyName sono specificati, si // verificherà il seguente processo: // (1) Se KeyName è presente in CSP, verrà utilizzata tale chiave. // (2) Se KeyName non esiste e KeyFile esiste, la chiave // di KeyFile verrà installata nel CSP e utilizzata. // (*) Per creare un KeyFile, è possibile utilizzare l'utilità sn.exe (Strong Name). // Quando si specifica il KeyFile, il percorso dovrà essere // relativo alla directory di output del progetto, ovvero // %Project Directory%\obj\<configuration>. Se ad esempio il KeyFile si // trova nella directory del progetto, occorre specificare l'attributo AssemblyKeyFile // come [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] // (*) La firma ritardata è un'opzione avanzata. Vedere la documentazione di Microsoft // .NET Framework per ulteriori informazioni. // [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")]

1 0

externals/clr clr.cpp,1.6,1.7
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/clr Modified Files: clr.cpp Log Message: restructured project (MSVC can't cope well with folder/classname mismatch) search for CLR DLLs in PD path first steps to efficient method handling Index: clr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/clr/clr.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** clr.cpp 6 Mar 2006 01:10:36 -0000 1.6 --- clr.cpp 7 Mar 2006 13:18:29 -0000 1.7 *************** *** 28,35 **** #include <map> static MonoDomain *monodomain; static MonoClass *clr_symbol,*clr_pointer,*clr_atom,*clr_atomlist,*clr_external; ! static MonoMethodDesc *clr_desc_main,*clr_desc_ctor; static MonoMethodDesc *clr_desc_bang,*clr_desc_float,*clr_desc_symbol,*clr_desc_pointer,*clr_desc_list,*clr_desc_anything; static MonoMethod *ext_method_bang,*ext_method_float,*ext_method_symbol,*ext_method_list,*ext_method_pointer,*ext_method_anything; --- 28,37 ---- #include <map> + #define CORELIB "PureData" + #define DLLEXT "dll" static MonoDomain *monodomain; static MonoClass *clr_symbol,*clr_pointer,*clr_atom,*clr_atomlist,*clr_external; ! static MonoMethodDesc *clr_desc_tostring,*clr_desc_ctor; static MonoMethodDesc *clr_desc_bang,*clr_desc_float,*clr_desc_symbol,*clr_desc_pointer,*clr_desc_list,*clr_desc_anything; static MonoMethod *ext_method_bang,*ext_method_float,*ext_method_symbol,*ext_method_list,*ext_method_pointer,*ext_method_anything; *************** *** 46,49 **** --- 48,52 ---- MonoClassField *mono_obj_field; MonoMethod *mono_ctor; + t_symbol *name; // ClrMethodMap *methods; } t_clr_class; *************** *** 66,69 **** --- 69,87 ---- + // Print error message given by exception + static void error_exc(char *txt,char *cname,MonoObject *exc) + { + MonoMethod *m = mono_method_desc_search_in_class(clr_desc_tostring,mono_get_exception_class()); + assert(m); + m = mono_object_get_virtual_method(exc,m); + assert(m); + MonoString *str = (MonoString *)mono_runtime_invoke(m,exc,NULL,NULL); + assert(str); + error("CLR class %s: %s",txt,cname); + error(mono_string_to_utf8(str)); + } + + + static void clr_method_bang(t_clr *x) { *************** *** 73,79 **** MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,NULL,&exc); ! if(exc) { ! error("Exception raised"); ! } } --- 91,95 ---- MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,NULL,&exc); ! if(exc) error_exc("Exception raised",x->clr_clss->name->s_name,exc); } *************** *** 86,92 **** MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) { ! error("Exception raised"); ! } } --- 102,106 ---- MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) error_exc("Exception raised",x->clr_clss->name->s_name,exc); } *************** *** 105,111 **** MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) { ! error("Exception raised"); ! } } --- 119,140 ---- MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) error_exc("Exception raised",x->clr_clss->name->s_name,exc); ! } ! ! static void clr_method_pointer(t_clr *x,t_gpointer *p) ! { ! assert(x && x->clr_clss); ! MonoMethod *m = mono_object_get_virtual_method(x->mono_obj,ext_method_pointer); ! assert(m); ! #if 0 ! MonoObject *ptrobj = mono_value_box(monodomain,clr_pointer,&p); ! MonoObject *o = (MonoObject *)mono_object_unbox(ptrobj); ! gpointer args = o; ! #else ! gpointer args = &p; ! #endif ! MonoObject *exc; ! mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) error_exc("Exception raised",x->clr_clss->name->s_name,exc); } *************** *** 152,177 **** MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) { ! error("Exception raised"); ! } ! } ! ! static void clr_method_pointer(t_clr *x,t_gpointer *p) ! { ! assert(x && x->clr_clss); ! MonoMethod *m = mono_object_get_virtual_method(x->mono_obj,ext_method_pointer); ! assert(m); ! #if 0 ! MonoObject *ptrobj = mono_value_box(monodomain,clr_pointer,&p); ! MonoObject *o = (MonoObject *)mono_object_unbox(ptrobj); ! gpointer args = o; ! #else ! gpointer args = &p; ! #endif ! MonoObject *exc; ! mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) { ! error("Exception raised"); ! } } --- 181,185 ---- MonoObject *exc; mono_runtime_invoke(m,x->mono_obj,&args,&exc); ! if(exc) error_exc("Exception raised",x->clr_clss->name->s_name,exc); } *************** *** 198,202 **** } - // this function is called by mono when it wants post messages to pd static void PD_Post(MonoString *str) --- 206,209 ---- *************** *** 236,239 **** --- 243,275 ---- } + static void PD_AddBang(MonoObject *method) + { + post("Add bang method"); + } + + static void PD_AddFloat(MonoObject *method) + { + post("Add float method"); + } + + static void PD_AddSymbol(MonoObject *method) + { + post("Add symbol method"); + } + + static void PD_AddPointer(MonoObject *method) + { + post("Add pointer method"); + } + + static void PD_AddList(MonoObject *method) + { + post("Add list method"); + } + + static void PD_AddAnything(MonoObject *method) + { + post("Add anything method"); + } #if 0 *************** *** 317,320 **** --- 353,357 ---- // store class pointer x->clr_clss = clss; + x->clr_clss->name = classname; // store our object pointer in External::ptr member *************** *** 330,345 **** gpointer args = lstobj; #endif MonoObject *exc; ! ! // call static constructor ! MonoObject *ret = mono_runtime_invoke(clss->mono_ctor,x->mono_obj,&args,&exc); ! if(ret) { ! post("Warning: returned value from %s::.ctor ignored",classname->s_name); ! // ??? do we have to mark ret as free? ! } if(exc) { pd_free((t_pd *)x); ! error("CLR class %s - exception raised in constructor",classname->s_name); return NULL; } --- 367,377 ---- gpointer args = lstobj; #endif + // call constructor MonoObject *exc; ! mono_runtime_invoke(clss->mono_ctor,x->mono_obj,&args,&exc); if(exc) { pd_free((t_pd *)x); ! error_exc("exception raised in constructor",classname->s_name,exc); return NULL; } *************** *** 366,370 **** // search for classname.dll in the PD path int fd; ! if ((fd = open_via_path(dirname, classname, ".dll", dirbuf, &nameptr, MAXPDSTRING, 1)) < 0) // not found goto bailout; --- 398,402 ---- // search for classname.dll in the PD path int fd; ! if ((fd = open_via_path(dirname, classname, "." DLLEXT, dirbuf, &nameptr, MAXPDSTRING, 1)) < 0) // not found goto bailout; *************** *** 378,391 **** // try to load assembly ! char path[MAXPDSTRING]; ! strcpy(path,dirname); ! strcat(path,"/"); ! // strcat(path,dirbuf); ! // strcat(path,"/"); ! strcat(path,nameptr); ! assembly = mono_domain_assembly_open(monodomain,path); if(!assembly) { ! error("clr: file %s couldn't be loaded!",path); goto bailout; } --- 410,420 ---- // try to load assembly ! strcat(dirbuf,"/"); ! strcat(dirbuf,classname); ! strcat(dirbuf,"." DLLEXT); ! assembly = mono_domain_assembly_open(monodomain,dirbuf); if(!assembly) { ! error("clr: file %s couldn't be loaded!",dirbuf); goto bailout; } *************** *** 415,425 **** // find static Main method method = mono_method_desc_search_in_class(clr_desc_main,clr_class->mono_class); if(method) { // set current class clr_setup_class = clr_class; // call static Main method ! MonoObject *ret = mono_runtime_invoke(method,NULL,NULL,NULL); // unset current class --- 444,469 ---- // find static Main method + MonoMethodDesc *clr_desc_main = mono_method_desc_new(":Setup",FALSE); + assert(clr_desc_main); + method = mono_method_desc_search_in_class(clr_desc_main,clr_class->mono_class); if(method) { + MonoObject *obj = mono_object_new(monodomain,clr_class->mono_class); + if(!obj) { + error("CLR class %s could not be instantiated",classname); + goto bailout; + } + + // store NULL in External::ptr member + void *x = NULL; + mono_field_set_value(obj,clr_class->mono_obj_field,&x); + // set current class clr_setup_class = clr_class; // call static Main method ! gpointer args = obj; ! MonoObject *exc; ! MonoObject *ret = mono_runtime_invoke(method,NULL,&args,&exc); // unset current class *************** *** 427,436 **** if(ret) { ! post("CLR - Warning: returned value from %s.Main ignored",classname); // ??? do we have to mark ret as free? } } else ! post("CLR - Warning: no %s.Main method found",classname); // find and save constructor --- 471,487 ---- if(ret) { ! post("CLR - Warning: returned value from %s.Setup ignored",classname); // ??? do we have to mark ret as free? } + + if(exc) { + MonoObject *ret = mono_runtime_invoke(method,NULL,&args,&exc); + + error_exc("CLR - Exception raised by Setup",classname,exc); + goto bailout; + } } else ! post("CLR - Warning: no %s.Setup method found",classname); // find and save constructor *************** *** 503,507 **** try { ! monodomain = mono_jit_init("PureData"); } catch(...) { --- 554,558 ---- try { ! monodomain = mono_jit_init(CORELIB); } catch(...) { *************** *** 510,526 **** if(monodomain) { ! // add mono to C hooks ! mono_add_internal_call("PureData.Core::Post",(const void *)PD_Post); ! mono_add_internal_call("PureData.Core::PostError",(const void *)PD_PostError); ! mono_add_internal_call("PureData.Core::PostBug",(const void *)PD_PostBug); ! mono_add_internal_call("PureData.Core::PostVerbose",(const void *)PD_PostVerbose); ! ! mono_add_internal_call("PureData.Core::SymGen", (const void *)PD_SymGen); ! mono_add_internal_call("PureData.Core::SymEval", (const void *)PD_SymEval); ! ! MonoAssembly *assembly = mono_domain_assembly_open (monodomain, "PureData.dll"); if(!assembly) { ! error("clr: assembly PureData.dll not found!"); return; } --- 561,579 ---- if(monodomain) { ! // try to find PureData.dll in the PD path ! char dirbuf[MAXPDSTRING],*nameptr; ! // search for classname.dll in the PD path ! int fd; ! if ((fd = open_via_path("",CORELIB,"." DLLEXT,dirbuf,&nameptr,MAXPDSTRING,1)) >= 0) { ! strcat(dirbuf,"/" CORELIB "." DLLEXT); ! close(fd); ! } ! else ! strcpy(dirbuf,CORELIB "." DLLEXT); ! // look for PureData.dll ! MonoAssembly *assembly = mono_domain_assembly_open (monodomain,dirbuf); if(!assembly) { ! error("clr: assembly " CORELIB "." DLLEXT " not found!"); return; } *************** *** 529,532 **** --- 582,602 ---- assert(image); + // add mono to C hooks + + mono_add_internal_call("PureData.Internal::SymGen(string)", (const void *)PD_SymGen); + mono_add_internal_call("PureData.Internal::SymEval(void*)", (const void *)PD_SymEval); + + mono_add_internal_call("PureData.External::Post(string)",(const void *)PD_Post); + mono_add_internal_call("PureData.External::PostError(string)",(const void *)PD_PostError); + mono_add_internal_call("PureData.External::PostBug(string)",(const void *)PD_PostBug); + mono_add_internal_call("PureData.External::PostVerbose(string)",(const void *)PD_PostVerbose); + + mono_add_internal_call("PureData.External::Add(PureData.External/MethodBang)", (const void *)PD_AddBang); + mono_add_internal_call("PureData.External::Add(PureData.External/MethodFloat)", (const void *)PD_AddFloat); + mono_add_internal_call("PureData.External::Add(PureData.External/MethodSymbol)", (const void *)PD_AddSymbol); + mono_add_internal_call("PureData.External::Add(PureData.External/MethodPointer)", (const void *)PD_AddPointer); + mono_add_internal_call("PureData.External::Add(PureData.External/MethodList)", (const void *)PD_AddList); + mono_add_internal_call("PureData.External::Add(PureData.External/MethodAnything)", (const void *)PD_AddAnything); + // load important classes clr_symbol = mono_class_from_name(image,"PureData","Symbol"); *************** *** 541,546 **** assert(clr_external); ! clr_desc_main = mono_method_desc_new("::Main()",FALSE); ! assert(clr_desc_main); clr_desc_ctor = mono_method_desc_new("::.ctor(AtomList)",FALSE); assert(clr_desc_ctor); --- 611,616 ---- assert(clr_external); ! clr_desc_tostring = mono_method_desc_new("::ToString()",FALSE); ! assert(clr_desc_tostring); clr_desc_ctor = mono_method_desc_new("::.ctor(AtomList)",FALSE); assert(clr_desc_ctor); *************** *** 571,577 **** // ready! ! post("CLR - (c)2006 Davide Morelli, Thomas Grill"); } else ! error("clr: mono domain couldn't be initialized!"); } --- 641,647 ---- // ready! ! post("CLR extension - (c)2006 Davide Morelli, Thomas Grill"); } else ! error("clr: mono domain couldn't be initialized!"); }

1 0

externals/clr/PureData - New directory
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/PureData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28222/PureData Log Message: Directory /cvsroot/pure-data/externals/clr/PureData added to the repository

1 0

externals/clr/Counter - New directory
by Thomas Grill 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/externals/clr/Counter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28222/Counter Log Message: Directory /cvsroot/pure-data/externals/clr/Counter added to the repository

1 0

abstractions/footils/list-abs prepent-help.pd,1.1,1.2
by Frank Barknecht 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/abstractions/footils/list-abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11409 Modified Files: prepent-help.pd Log Message: Extended example Index: prepent-help.pd =================================================================== RCS file: /cvsroot/pure-data/abstractions/footils/list-abs/prepent-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prepent-help.pd 7 Mar 2006 10:13:17 -0000 1.1 --- prepent-help.pd 7 Mar 2006 10:22:34 -0000 1.2 *************** *** 1,23 **** ! #N canvas 262 329 524 303 10; ! #X obj 338 151 prepent set; ! #X msg 338 206; ! #X floatatom 338 73 5 0 0 0 - - -; ! #X msg 410 123 set; ! #X msg 440 123 add2; ! #X msg 348 185 set; #X floatatom 49 67 5 0 0 0 - - -; #X obj 49 127 prepent x; ! #X obj 49 168 route x; ! #X obj 163 167 route x; ! #X obj 163 131 list prepend x; ! #X obj 163 200 print prepend_x; ! #X obj 49 201 print prepent_x; #X text 43 15 [prepent] is a shortcut for [list prepend]--[list trim] ; ! #X obj 163 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 49 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; - #X text 161 105 Without trim:; #X connect 0 0 1 0; #X connect 2 0 0 0; --- 1,29 ---- ! #N canvas 262 329 608 369 10; ! #X obj 429 170 prepent set; ! #X msg 429 225; ! #X floatatom 429 92 5 0 0 0 - - -; ! #X msg 501 142 set; ! #X msg 531 142 add2; ! #X msg 439 204 set; #X floatatom 49 67 5 0 0 0 - - -; #X obj 49 127 prepent x; ! #X obj 233 131 list prepend x; ! #X obj 233 240 print prepend_x; ! #X obj 49 241 print prepent_x; #X text 43 15 [prepent] is a shortcut for [list prepend]--[list trim] ; ! #X obj 233 267 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 49 267 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 231 105 Without trim:; ! #X obj 233 167 route x list; ! #X obj 272 196 print prepend_list; ! #X obj 49 168 route x list; ! #X obj 88 198 print prepent_list; ! #X obj 272 216 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X obj 88 218 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X connect 0 0 1 0; #X connect 2 0 0 0; *************** *** 26,34 **** #X connect 5 0 1 0; #X connect 6 0 7 0; ! #X connect 6 0 10 0; ! #X connect 7 0 8 0; ! #X connect 8 0 12 0; #X connect 8 0 15 0; ! #X connect 9 0 11 0; ! #X connect 9 0 14 0; ! #X connect 10 0 9 0; --- 32,44 ---- #X connect 5 0 1 0; #X connect 6 0 7 0; ! #X connect 6 0 8 0; ! #X connect 7 0 17 0; #X connect 8 0 15 0; ! #X connect 15 0 9 0; ! #X connect 15 0 12 0; ! #X connect 15 1 16 0; ! #X connect 15 1 19 0; ! #X connect 17 0 10 0; ! #X connect 17 0 13 0; ! #X connect 17 1 18 0; ! #X connect 17 1 20 0;

1 0

abstractions/footils/list-abs prepent-help.pd, NONE, 1.1 prepent.pd, NONE, 1.1
by Frank Barknecht 07 Mar '06

07 Mar '06

Update of /cvsroot/pure-data/abstractions/footils/list-abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7151 Added Files: prepent-help.pd prepent.pd Log Message: prepent: prepend-trim --- NEW FILE: prepent.pd --- #N canvas 0 0 450 300 10; #X obj 90 88 inlet; #X obj 90 205 outlet; #X obj 90 132 list prepend \$1; #X obj 90 157 list trim; #X obj 190 87 inlet; #X connect 0 0 2 0; #X connect 2 0 3 0; #X connect 3 0 1 0; #X connect 4 0 2 1; --- NEW FILE: prepent-help.pd --- #N canvas 262 329 524 303 10; #X obj 338 151 prepent set; #X msg 338 206; #X floatatom 338 73 5 0 0 0 - - -; #X msg 410 123 set; #X msg 440 123 add2; #X msg 348 185 set; #X floatatom 49 67 5 0 0 0 - - -; #X obj 49 127 prepent x; #X obj 49 168 route x; #X obj 163 167 route x; #X obj 163 131 list prepend x; #X obj 163 200 print prepend_x; #X obj 49 201 print prepent_x; #X text 43 15 [prepent] is a shortcut for [list prepend]--[list trim] ; #X obj 163 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 49 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X text 161 105 Without trim:; #X connect 0 0 1 0; #X connect 2 0 0 0; #X connect 3 0 0 1; #X connect 4 0 0 1; #X connect 5 0 1 0; #X connect 6 0 7 0; #X connect 6 0 10 0; #X connect 7 0 8 0; #X connect 8 0 12 0; #X connect 8 0 15 0; #X connect 9 0 11 0; #X connect 9 0 14 0; #X connect 10 0 9 0;

1 0

externals/clr makefile.darwin,1.3,1.4
by Thomas Grill 06 Mar '06

06 Mar '06

Update of /cvsroot/pure-data/externals/clr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16888 Modified Files: makefile.darwin Log Message: changed from libs to framework Index: makefile.darwin =================================================================== RCS file: /cvsroot/pure-data/externals/clr/makefile.darwin,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.darwin 28 Jan 2006 10:30:54 -0000 1.3 --- makefile.darwin 6 Mar 2006 16:28:54 -0000 1.4 *************** *** 14,29 **** PDPATH=/Users/thomas/Develop/pd/devel_0_39 - MONO=/Library/Frameworks/Mono.Framework # where is the PD executable? PD=$(PDPATH)/bin/pd ! LDFLAGS=-L$(MONO)/Libraries -lmono -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 # -lintl -liconv ! DARWININCLUDE = -I$(MONO)/Headers -I$(MONO)/Headers/glib-2.0 -I$(MONO)/Libraries/glib-2.0/include -I$(PDPATH)/src - DARWINCFLAGS = -DPD -O2 .cpp.pd_darwin: ! g++ -dynamiclib -undefined dynamic_lookup $(DARWINCFLAGS) $(DARWININCLUDE) $(CFLAGS) $(LDFLAGS) -o $*.pd_darwin $*.cpp --- 14,35 ---- PDPATH=/Users/thomas/Develop/pd/devel_0_39 MONO=/Library/Frameworks/Mono.Framework + CFLAGS += -DPD -O2 + # where is the PD executable? PD=$(PDPATH)/bin/pd ! LDFLAGS=-framework Mono ! INCLUDE = -I$(MONO)/Headers -I$(MONO)/Headers/glib-2.0 -I$(MONO)/Libraries/glib-2.0/include -I$(PDPATH)/src ! ! # new version ! OPTIONS = -dynamiclib -undefined dynamic_lookup ! ! # old version ! #OPTIONS = -bundle -bundle_loader $(PD) .cpp.pd_darwin: ! g++ $(OPTIONS) $(INCLUDE) $(CFLAGS) $(LDFLAGS) -o $*.pd_darwin $*.cpp

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2006