General/sharplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to SharpLib

Browse Source
This commit is contained in:
Marc Hernandez 2021-06-17 01:47:52 -07:00
parent 26716c6648
commit 2844950af3
22 changed files with 2380 additions and 2494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,7 +1,3 @@
###################################
# Git ignore file for Molyjam2012 #
###################################
#Folders
Library/
Temp/
@ -12,6 +8,7 @@ Release/
run/
bin/
obj/
.vs/
#Project/User Preference Files
*.pidb

10
Helpers.cs
View File

@ -147,28 +147,28 @@ namespace lib
}
else
{
Log.error( String.Format( $"No attributes in node while loading file {filename}" ) );
log.error( String.Format( $"No attributes in node while loading file {filename}" ) );
}
}
else
{
Log.error( String.Format( $"Incorrect key {node.Name} found while loading file {filename}" ) );
log.error( String.Format( $"Incorrect key {node.Name} found while loading file {filename}" ) );
}
}
}
else
{
if( keyMI == null )
Log.error( String.Format( $"Key type conversion not found for type {keyType}" ) );
log.error( String.Format( $"Key type conversion not found for type {keyType}" ) );
if( valMI == null )
Log.error( String.Format( $"Val type conversion not found for type {valType}" ) );
log.error( String.Format( $"Val type conversion not found for type {valType}" ) );
}
}
else
{
Log.error( String.Format( $"No dictionary element found while loading file {filename}" ) );
log.error( String.Format( $"No dictionary element found while loading file {filename}" ) );
}
}

4
Id.cs
View File

@ -13,7 +13,7 @@ namespace lib
{
public struct Id<T> : IComparable, IFormattable, IConvertible, IComparable<ulong>, IEquatable<ulong>
public struct Id<T>: IComparable, IFormattable, IConvertible, IComparable<ulong>, IEquatable<ulong>
{
public const ulong Min = 0uL;
public const ulong Max = 18446744073709551615uL;
@ -29,7 +29,7 @@ namespace lib
s_rand.NextBytes( buf );
var newId = BitConverter.ToUInt64( buf, 0 );
var newId = BitConverter.ToUInt64(buf, 0);
return new Id<T> { m_value = newId };
}

1
SharpLib.csproj
View File

@ -23,6 +23,7 @@
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="reflect\" />
</ItemGroup>

4
Token.cs
View File

@ -47,8 +47,8 @@ namespace lib
return m_str;
}
int m_hash;
String m_str;
int m_hash;
String m_str;
}
}

9
Utilities.cs
View File

@ -22,6 +22,7 @@
// THE SOFTWARE.
#pragma warning disable SA1405 // Debug.Assert must provide message text
using att;
using System;
using System.Collections;
using System.Collections.Generic;
@ -88,12 +89,12 @@ namespace lib
{
if( !Directory.Exists( path ) )
{
lib.Log.info( $"Creating directory {path}" );
log.info( $"Creating directory {path}" );
Directory.CreateDirectory( path );
}
else
{
lib.Log.debug( $"{path} already exists." );
log.debug( $"{path} already exists." );
}
}
@ -216,7 +217,7 @@ namespace lib
unsafe
{
fixed ( void* pBuffer = buffer )
fixed( void* pBuffer = buffer )
Interop.Write( pBuffer, source, 0, source.Length );
}
return buffer;
@ -339,7 +340,7 @@ namespace lib
{
unsafe
{
fixed ( void* pDest = destination )
fixed( void* pDest = destination )
{
Write( (IntPtr)pDest, data, offset, count );
}

2
att/CanBeNullAttribute.cs
View File

@ -45,7 +45,7 @@ namespace att
AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter )]
public sealed class CanBeNullAttribute : Attribute
public sealed class CanBeNullAttribute: Attribute
{
}
}

2
att/NotNullAttribute.cs
View File

@ -19,7 +19,7 @@ namespace att
AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter )]
public sealed class NotNullAttribute : Attribute
public sealed class NotNullAttribute: Attribute
{
}
}

20
cfg/Config.cs
View File

@ -6,7 +6,7 @@ using System.Reflection;
namespace lib
{
public class DescAttribute : Attribute
public class DescAttribute: Attribute
{
public string Desc { get; private set; }
@ -17,7 +17,7 @@ namespace lib
}
[Serializable]
public class ConfigCfg : Config
public class ConfigCfg: Config
{
public readonly bool writeOutTemplateFiles = true;
}
@ -83,7 +83,7 @@ namespace lib
try
{
FileStream fs = new FileStream( filename, FileMode.Open, FileAccess.Read );
FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read);
XmlFormatter2 formatter = new XmlFormatter2();
@ -93,13 +93,13 @@ namespace lib
}
catch( FileNotFoundException )
{
Type[] types = new Type[ 0 ];
object[] parms = new object[ 0 ];
Type[] types = new Type[0];
object[] parms = new object[0];
//types[ 0 ] = typeof( string );
//parms[ 0 ] = filename;
ConstructorInfo cons = t?.GetConstructor( types );
ConstructorInfo cons = t?.GetConstructor(types);
try
{
@ -107,7 +107,7 @@ namespace lib
}
catch( Exception e )
{
Log.error( $"Exception while creating config {t.ToString()}, Msg {e.Message}" );
log.error( $"Exception while creating config {t.ToString()}, Msg {e.Message}" );
}
//cfg.SetFilename( filename );
@ -116,11 +116,11 @@ namespace lib
{
var templateFile = $"templates/{filename}";
var dirName = Path.GetDirectoryName( templateFile );
var dirName = Path.GetDirectoryName(templateFile);
lib.Util.checkAndAddDirectory( dirName );
lib.Log.info( $"Writing out template config of type {t?.Name} in {templateFile}" );
log.info( $"Writing out template config of type {t?.Name} in {templateFile}" );
Config.save( cfg, templateFile );
}
@ -136,7 +136,7 @@ namespace lib
static public void save( Config cfg, String filename )
{
FileStream fs = new FileStream( filename, FileMode.Create, FileAccess.Write );
FileStream fs = new FileStream(filename, FileMode.Create, FileAccess.Write);
XmlFormatter2 formatter = new XmlFormatter2();

645
logging/Log.cs
View File

@ -8,66 +8,38 @@ using System.Collections.Immutable;
using System.Reflection;
//using System.Threading.Tasks;
namespace lib
static public class log
{
[Flags]
public enum LogTypeNew
{
Invalid = 0,
// Frequency
FrequencyBase = 1,
FrequencyBits = 2,
FrequencyMask = ( ( 1 << FrequencyBits ) - 1 ) << FrequencyBase,
Detail = 0b01 << FrequencyBase,
Normal = 0b10 << FrequencyBase,
Overview = 0b11 << FrequencyBase,
// Type
TypeBase = FrequencyBase + FrequencyBits,
TypeBits = 3,
TypeMask = ( ( 1 << TypeBits ) - 1 ) << TypeBase,
Startup = 0b001 << TypeBase,
Running = 0b010 << TypeBase,
Shutdown = 0b011 << TypeBase,
Error = 0b101 << TypeBase,
}
[Flags]
public enum LogType
{
Invalid = 0,
Trace = 1,
Debug = 2,
Info = 3,
High = 4,
Warn = 5,
Error = 6,
Fatal = 7,
Trace = 1,
Debug = 2,
Info = 3,
High = 4,
Warn = 5,
Error = 6,
Fatal = 7,
}
public struct LogEvent
{
public DateTime Time;
public LogType LogType;
public string Msg;
public string Path;
public int Line;
public string Member;
public LogType LogType;
public string Msg;
public string Path;
public int Line;
public string Member;
public string Cat;
public object Obj;
public string Cat;
public object Obj;
static ImmutableDictionary<string, string> m_shortname = ImmutableDictionary<string, string>.Empty;
static ImmutableDictionary<int, string> s_shortname = ImmutableDictionary<int, string>.Empty;
public LogEvent( LogType logType, string msg, string path, int line, string member, string cat, object obj )
@ -76,17 +48,18 @@ namespace lib
//Cache the automatic category names
if( string.IsNullOrEmpty( cat ) )
{
if( m_shortname.TryGetValue( path, out var autoCat ) )
var pathHash = path.GetHashCode();
if( s_shortname.TryGetValue( pathHash, out var autoCat ) )
{
cat = autoCat;
}
else
{
var pathPieces = path.Split('\\');
var pathPieces = path.Split( '\\' );
var lastDir = pathPieces[pathPieces.Length - 2];
var lastDir = pathPieces[ pathPieces.Length - 2 ];
ImmutableInterlocked.AddOrUpdate( ref m_shortname, path, lastDir, ( key, value ) => { return lastDir; } );
ImmutableInterlocked.AddOrUpdate( ref s_shortname, pathHash, lastDir, ( key, value ) => { return lastDir; } );
cat = lastDir;
}
@ -107,343 +80,257 @@ namespace lib
public class Log : TraceListener
static public void create( string filename )
{
static public void create( string filename )
createLog( filename );
}
static public void destroy()
{
string msg = "==============================================================================\nLogfile shutdown at " + DateTime.Now.ToString();
var evt = CreateLogEvent( LogType.Info, msg, "System", null );
writeToAll( evt );
stop();
}
static LogEvent CreateLogEvent( LogType logType, string msg, string cat, object obj, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
var logEvent = new LogEvent( logType, msg, path, line, member, cat, obj );
return logEvent;
}
// Forwards.
static public void fatal( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Fatal, path, line, member, cat, obj );
}
static public void error( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Error, path, line, member, cat, obj );
}
static public void warn( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Warn, path, line, member, cat, obj );
}
static public void info( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Info, path, line, member, cat, obj );
}
static public void high( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.High, path, line, member, cat, obj );
}
static public void debug( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Debug, path, line, member, cat, obj );
}
static public void trace( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
logBase( msg, LogType.Trace, path, line, member, cat, obj );
}
static object s_lock = new object();
static public void logBase( string msg, LogType type = LogType.Debug, string path = "", int line = -1, string member = "", string cat = "unk", object obj = null )
{
// @@@@@ TODO Get rid of this lock.
var evt = new LogEvent( type, msg, path, line, member, cat, obj );
lock( s_lock )
{
s_log = new Log( filename );
}
static public void destroy()
{
string msg = "==============================================================================\nLogfile shutdown at " + DateTime.Now.ToString();
var evt = CreateLogEvent( LogType.Info, msg, "System", null );
s_log.writeToAll( evt );
s_log.stop();
s_log = null;
}
static public Log s_log;
/*
static public Log log
{
get
{
return s_log;
}
}
*/
static LogEvent CreateLogEvent( LogType logType, string msg, string cat, object obj, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
var logEvent = new LogEvent( logType, msg, path, line, member, cat, obj );
return logEvent;
}
// Forwards.
static public void fatal( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Fatal, path, line, member, cat, obj );
}
static public void error( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Error, path, line, member, cat, obj );
}
static public void warn( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Warn, path, line, member, cat, obj );
}
static public void info( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Info, path, line, member, cat, obj );
}
static public void high( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.High, path, line, member, cat, obj );
}
static public void debug( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Debug, path, line, member, cat, obj );
}
static public void trace( string msg, string cat = "", object obj = null, [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
log( msg, LogType.Trace, path, line, member, cat, obj );
}
static public void log( string msg, LogType type = LogType.Debug, string path = "", int line = -1, string member = "", string cat = "unk", object obj = null )
{
// @@@@@ TODO Get rid of this lock.
var evt = new LogEvent( type, msg, path, line, member, cat, obj );
lock( s_log )
{
s_log.writeToAll( evt );
}
}
static public void logProps( object obj, string header, LogType type = LogType.Debug, string cat = "", string prefix = "" )
{
var list = scr.GetAllProperties( obj.GetType() );
lock( s_log )
{
var evt = CreateLogEvent( type, header, cat, obj );
s_log.writeToAll( evt );
foreach( var pi in list )
{
try
{
var v = pi.GetValue( obj );
log( $"{prefix}{pi.Name} = {v}", type, cat );
}
catch( Exception ex )
{
log( $"Exception processing {pi.Name} {ex.Message}", LogType.Error, "log" );
}
}
}
}
//This might seem a little odd, but the intent is that usually you wont need to set notExpectedValue.
static public void expected<T>( T value, string falseString, string trueString = "", T notExpectedValue = default( T ) )
{
if( !value.Equals( notExpectedValue ) )
{
lib.Log.info( $"Properly got {value}{trueString}" );
}
else
{
lib.Log.warn( $"Got {notExpectedValue} instead of {value}{falseString}" );
}
}
private Log( string filename )
{
//TODO: Fix this so itll work without a directory.
Directory.CreateDirectory( Path.GetDirectoryName( filename ) );
m_stream = new FileStream( filename, FileMode.Append, FileAccess.Write );
m_writer = new StreamWriter( m_stream );
m_errorStream = new FileStream( filename + ".error", FileMode.Append, FileAccess.Write );
m_errorWriter = new StreamWriter( m_errorStream );
//Debug.Listeners.Add( this );
string msg = "\n==============================================================================\nLogfile " + filename + " startup at " + DateTime.Now.ToString();
var evt = CreateLogEvent( LogType.Info, msg, "System", null );
writeToAll( evt );
}
public override void Write( string msg )
{
WriteLine( msg );
}
public override void WriteLine( string msg )
{
error( msg );
//base.WriteLine( msg );
}
void stop()
{
m_writer.Close();
m_stream.Close();
m_errorWriter.Close();
m_errorStream.Close();
}
public void addDelegate( Log_delegate cb )
{
m_delegates.Add( cb );
}
/*
private void writeFileAndLine( StackTrace st )
{
StackFrame frame = st.GetFrame( 1 );
string srcFile = frame.GetFileName();
string srcLine = frame.GetFileLineNumber().Tostring();
Console.WriteLine( $"{srcFile} ({srcLine}):" );
}
private void writeStack( StackTrace st )
{
for( int i=0; i<st.FrameCount; ++i )
{
StackFrame frame = st.GetFrame( i );
string srcFile = frame.GetFileName();
string srcLine = frame.GetFileLineNumber().Tostring();
if( srcFile != null )
{
Console.WriteLine( $"{srcFile} ({srcLine})" );
}
}
}
*/
public static char getSymbol( LogType type )
{
switch( type )
{
case LogType.Trace:
return ' ';
case LogType.Debug:
return ' ';
case LogType.Info:
return ' ';
case LogType.High:
return '+';
case LogType.Warn:
return '+';
case LogType.Error:
return '*';
case LogType.Fatal:
return '*';
default:
return '?';
}
}
private void writeToAll( LogEvent evt )
{
try
{
// _SHOULDNT_ need this since we lock at the top.
//lock( this )
{
char sym = getSymbol( evt.LogType );
var truncatedCat = evt.Cat.Substring(0, Math.Min( 8, evt.Cat.Length ) );
string finalLine = string.Format( "{0,-8}{1}| {2}", truncatedCat, sym, evt.Msg );
//Console.WriteLine( finalMsg );
//Console.Out.Write( finalMsg );
/*
foreach( var l_obj in Debug.Listeners )
{
var l = l_obj as TraceListener;
if( l != null && l != this )
{
l.WriteLine( finalMsg );
}
}
*/
m_writer.WriteLine( finalLine );
m_writer.Flush();
foreach( Log_delegate cb in m_delegates )
{
//lock( cb )
{
cb( evt );
}
}
}
}
catch( Exception ex )
{
//oops.
//int dummy = 0;
}
}
/*
private void error_i( string msg, object obj )
{
//var t = Task.Run( () => {
StackTrace st = new StackTrace( true );
writeStack( st );
string msgPrint = msg;
if( args.Length > 0 )
{
msgPrint = string.Format( msg, args );
}
writeToAll( "error", "log", msgPrint );
//} );
}
private void warn_i( string msg, object obj )
{
//var t = Task.Run( () => {
StackTrace st = new StackTrace( true );
writeStack( st );
string msgPrint = msg;
if( args.Length > 0 )
{
msgPrint = string.Format( msg, args );
}
writeToAll( "warn", "log", msgPrint );
//});
}
private void info_i( string msg, object obj )
{
//var t = Task.Run( () => {
StackTrace st = new StackTrace( true );
string msgPrint = msg;
if( args.Length > 0 )
{
msgPrint = string.Format( msg, args );
}
writeToAll( "info", "log", msgPrint );
//} );
}
*/
private Stream m_stream;
private StreamWriter m_writer;
private Stream m_errorStream;
private StreamWriter m_errorWriter;
private ArrayList m_delegates = new ArrayList();
}
static public void logProps( object obj, string header, LogType type = LogType.Debug, string cat = "", string prefix = "", [CallerFilePath] string path = "", [CallerLineNumber] int line = -1, [CallerMemberName] string member = "" )
{
var list = refl.GetAllProperties( obj.GetType() );
lock( s_lock )
{
var evt = new LogEvent( type, header, path, line, member, cat, obj );
//var evt = CreateLogEvent( type, header, cat, obj );
writeToAll( evt );
foreach( var pi in list )
{
try
{
var v = pi.GetValue( obj );
logBase( $"{prefix}{pi.Name} = {v}", type, path, line, member, cat );
}
catch( Exception ex )
{
logBase( $"Exception processing {pi.Name} {ex.Message}", LogType.Error, "log" );
}
}
}
}
//This might seem a little odd, but the intent is that usually you wont need to set notExpectedValue.
static public void expected<T>( T value, string falseString, string trueString = "", T notExpectedValue = default( T ) )
{
if( !value.Equals( notExpectedValue ) )
{
log.info( $"Properly got {value}{trueString}" );
}
else
{
log.warn( $"Got {notExpectedValue} instead of {value}{falseString}" );
}
}
static private void createLog( string filename )
{
string dir = Path.GetDirectoryName( filename );
if( dir.Length > 0 )
{
Directory.CreateDirectory( dir );
}
s_stream = new FileStream( filename, FileMode.Append, FileAccess.Write );
s_writer = new StreamWriter( s_stream );
s_errorStream = new FileStream( filename + ".error", FileMode.Append, FileAccess.Write );
s_errorWriter = new StreamWriter( s_errorStream );
//Debug.Listeners.Add( this );
string msg = "\n==============================================================================\nLogfile " + filename + " startup at " + DateTime.Now.ToString();
var evt = CreateLogEvent( LogType.Info, msg, "System", null );
writeToAll( evt );
}
/*
static public override void Write( string msg ) {
WriteLine( msg );
}
static public override void WriteLine( string msg ) {
error( msg );
//base.WriteLine( msg );
}
*/
static void stop()
{
s_writer.Close();
s_stream.Close();
s_errorWriter.Close();
s_errorStream.Close();
}
static public void addDelegate( Log_delegate cb )
{
s_delegates.Add( cb );
}
public static char getSymbol( LogType type )
{
switch( type )
{
case LogType.Trace:
return ' ';
case LogType.Debug:
return ' ';
case LogType.Info:
return ' ';
case LogType.High:
return '+';
case LogType.Warn:
return '+';
case LogType.Error:
return '*';
case LogType.Fatal:
return '*';
default:
return '?';
}
}
static private void writeToAll( LogEvent evt )
{
try
{
// _SHOULDNT_ need this since we lock at the top.
//lock( this )
{
char sym = getSymbol( evt.LogType );
var truncatedCat = evt.Cat.Substring( 0, Math.Min( 8, evt.Cat.Length ) );
string finalLine = string.Format( "{0,-8}{1}| {2}", truncatedCat, sym, evt.Msg );
//Console.WriteLine( finalMsg );
//Console.Out.Write( finalMsg );
s_writer.WriteLine( finalLine );
Console.WriteLine( finalLine );
Debug.WriteLine( finalLine );
s_writer.Flush();
foreach( Log_delegate cb in s_delegates )
{
{
cb( evt );
}
}
}
}
catch( Exception ex )
{
Console.WriteLine( "EXCEPTION DURING LOGGING" );
Console.WriteLine( "EXCEPTION DURING LOGGING" );
Console.WriteLine( "EXCEPTION DURING LOGGING" );
Console.WriteLine( "EXCEPTION DURING LOGGING" );
Console.WriteLine( "EXCEPTION DURING LOGGING" );
Console.WriteLine( $"Exception {ex}" );
Debug.WriteLine( "EXCEPTION DURING LOGGING" );
Debug.WriteLine( "EXCEPTION DURING LOGGING" );
Debug.WriteLine( "EXCEPTION DURING LOGGING" );
Debug.WriteLine( "EXCEPTION DURING LOGGING" );
Debug.WriteLine( "EXCEPTION DURING LOGGING" );
Debug.WriteLine( $"Exception {ex}" );
}
}
private static Stream s_stream;
private static StreamWriter s_writer;
private static Stream s_errorStream;
private static StreamWriter s_errorWriter;
private static ArrayList s_delegates = new ArrayList();

1488
math/AngleSingle.cs
View File

File diff suppressed because it is too large Load Diff

8
mod/Modules.cs
View File

@ -10,7 +10,7 @@ namespace mod
{
[Serializable]
public class Config : lib.Config
public class Config: lib.Config
{
public String name = "Generic";
}
@ -33,13 +33,13 @@ namespace mod
[Serializable]
public class FluidConfig : Config
public class FluidConfig: Config
{
public String type = "none";
}
public class FluidBase : Base
public class FluidBase: Base
{
public new FluidConfig Cfg { get { return (FluidConfig)base.Cfg; } }
@ -65,7 +65,7 @@ namespace mod
[Serializable]
public class SystemConfig : Config
public class SystemConfig: Config
{
public String type = "none";
}

12
net/Conn.cs
View File

@ -28,7 +28,7 @@ namespace lib
}
public class NewEveryCall<T> : ISerDes<T> where T : IFormatter, new()
public class NewEveryCall<T>: ISerDes<T> where T : IFormatter, new()
{
public T getInstance()
{
@ -38,7 +38,7 @@ namespace lib
public class Conn<T, TInst> where T : IFormatter, new()
where TInst : ISerDes<T>, new()
where TInst : ISerDes<T>, new()
{
public Socket Sock { get { return m_socket; } }
public Stream Stream { get { return m_streamNet; } }
@ -75,7 +75,7 @@ namespace lib
}
catch( System.Xml.XmlException ex )
{
lib.Log.error( $"Outer Exception {ex.Message}" );
log.error( $"Outer Exception {ex.Message}" );
}
return obj;
@ -92,8 +92,8 @@ namespace lib
formatter.Serialize( ms, obj );
//var str = System.Text.Encoding.Default.GetString( mm_buffer, 0, (int)ms.Position );
//lib.Log.info( $"Sent data {str} of length {ms.Position}" );
//lib.Log.info( $"Sent {obj}" );
//log.info( $"Sent data {str} of length {ms.Position}" );
//log.info( $"Sent {obj}" );
byte[] byteSize = BitConverter.GetBytes( (uint)ms.Position );
m_streamNet.Write( byteSize, 0, 4 );
@ -103,7 +103,7 @@ namespace lib
}
catch( Exception e )
{
lib.Log.warn( $"Exception sending obj {obj} of {e}" );
log.warn( $"Exception sending obj {obj} of {e}" );
throw;
}
}

8
net/NetMsg.cs
View File

@ -43,14 +43,14 @@ namespace lib.Net
};
[Serializable]
public class CreateEntity : Admin
public class CreateEntity: Admin
{
}
[Serializable]
public class MoveEntity : Admin
public class MoveEntity: Admin
{
}
@ -69,7 +69,7 @@ namespace lib.Net
[Serializable]
public class EntityPos : EntityBase
public class EntityPos: EntityBase
{
public EntityPos( int id, float x, float y, float z ) :
base( id )
@ -85,7 +85,7 @@ namespace lib.Net
}
[Serializable]
public class EntityDesc : EntityBase
public class EntityDesc: EntityBase
{
public EntityDesc( int id ) :
base( id )

12
reflect/Scr.cs → reflect/refl.cs
View File

@ -14,7 +14,7 @@ using System.Threading.Tasks;
static public class scr
static public class refl
{
public class PredEnumerator
@ -30,7 +30,7 @@ static public class scr
}
}
public class PredEnumerator<T> : PredEnumerator, IEnumerator<T>
public class PredEnumerator<T>: PredEnumerator, IEnumerator<T>
{
public T Current => m_en.Current;
@ -100,12 +100,12 @@ static public class scr
}
#endregion
IEnumerator<T> m_en;
Predicate<T> m_pred;
IEnumerator<T> m_en;
Predicate<T> m_pred;
}
public class PredEnumerable<T> : IEnumerable<T>
public class PredEnumerable<T>: IEnumerable<T>
{
public PredEnumerable( PredEnumerator<T> en )
{
@ -132,7 +132,7 @@ static public class scr
BindingFlags.DeclaredOnly |
BindingFlags.NonPublic |
BindingFlags.Public |
BindingFlags.Instance);
BindingFlags.Instance );
var en = PredEnumerator.Create<FieldInfo>( fieldArr.AsEnumerable<FieldInfo>(), fa => fa.GetCustomAttribute( typeof( NonSerializedAttribute ) ) == null );

18
res/Resource.cs
View File

@ -16,7 +16,7 @@ namespace res
[Serializable]
public class Ref : lib.I_Serialize
public class Ref: lib.I_Serialize
{
public string filename { get { return m_filename; } }
@ -51,7 +51,7 @@ namespace res
}
[Serializable]
public class Ref<T> : Ref where T : class
public class Ref<T>: Ref where T : class
{
public T res => m_res != null ? m_res : m_res = Mgr.load<T>( filename );
@ -114,7 +114,7 @@ namespace res
}
class LoadHolder<T> : LoadHolder
class LoadHolder<T>: LoadHolder
{
public LoadHolder( Load<T> _dlgtLoad )
{
@ -247,10 +247,10 @@ namespace res
if( wr.TryGetTarget( out var v ) )
return v;
lib.Log.info( $"{filename} was in cache, but its been dropped, reloading." );
log.info( $"{filename} was in cache, but its been dropped, reloading." );
}
lib.Log.warn( $"Block Loading {filename}." );
log.warn( $"Block Loading {filename}." );
var newV = actualLoad<T>( filename );
@ -268,7 +268,7 @@ namespace res
if( wr.TryGetTarget( out var v ) )
return v;
lib.Log.error( $"{filename} was in cache, but its been dropped, reloading." );
log.error( $"{filename} was in cache, but its been dropped, reloading." );
}
}
@ -291,19 +291,19 @@ namespace res
//Done loading
if( !ImmutableInterlocked.TryRemove( ref s_loading, filename, out var oldEvt ) )
{
lib.Log.error( $"Error removing loading event for {filename}" );
log.error( $"Error removing loading event for {filename}" );
}
if( alreadyAdded )
{
lib.Log.error( $"Key {filename} already existed, though it shouldnt." );
log.error( $"Key {filename} already existed, though it shouldnt." );
}
return v;
}
else
{
lib.Log.error( $"Loader could not be found for type {typeof( T )}" );
log.error( $"Loader could not be found for type {typeof( T )}" );
return ResCache<T>.s_default;
}

2
ser/SerializableDictionary.cs
View File

@ -11,7 +11,7 @@ using System.Security.Permissions;
namespace lib
{
[Serializable]
public class SerializableDictionary<TKey, TVal> : Dictionary<TKey, TVal>, IXmlSerializable, ISerializable
public class SerializableDictionary<TKey, TVal>: Dictionary<TKey, TVal>, IXmlSerializable, ISerializable
{
#region Constants
private const string DictionaryNodeName = "Dictionary";

94
ser/VersionFormatter.cs
View File

@ -12,7 +12,7 @@ namespace lib
/// <summary>
///
/// </summary>
public class VersionFormatter : IFormatter
public class VersionFormatter: IFormatter
{
public enum ETypes
{
@ -160,44 +160,44 @@ namespace lib
switch( typeName )
{
case "Int32":
writer.Write( (char)ETypes.Int32 );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.Int32 );
writer.Write( name.GetHashCode() );
write( writer, Convert.ToInt32( fi.GetValue( parentObj ) ) );
break;
write( writer, Convert.ToInt32( fi.GetValue( parentObj ) ) );
break;
case "Single":
writer.Write( (char)ETypes.Single );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.Single );
writer.Write( name.GetHashCode() );
write( writer, Convert.ToSingle( fi.GetValue( parentObj ) ) );
break;
write( writer, Convert.ToSingle( fi.GetValue( parentObj ) ) );
break;
case "Double":
writer.Write( (char)ETypes.Double );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.Double );
writer.Write( name.GetHashCode() );
write( writer, Convert.ToDouble( fi.GetValue( parentObj ) ) );
break;
write( writer, Convert.ToDouble( fi.GetValue( parentObj ) ) );
break;
case "Char":
writer.Write( (char)ETypes.Char );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.Char );
writer.Write( name.GetHashCode() );
write( writer, Convert.ToChar( fi.GetValue( parentObj ) ) );
break;
write( writer, Convert.ToChar( fi.GetValue( parentObj ) ) );
break;
case "String":
writer.Write( (char)ETypes.String );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.String );
writer.Write( name.GetHashCode() );
write( writer, Convert.ToString( fi.GetValue( parentObj ) ) );
break;
write( writer, Convert.ToString( fi.GetValue( parentObj ) ) );
break;
case "Boolean":
writer.Write( (char)ETypes.Boolean );
writer.Write( name.GetHashCode() );
writer.Write( (char)ETypes.Boolean );
writer.Write( name.GetHashCode() );
writer.Write( Convert.ToBoolean( fi.GetValue( parentObj ) ) );
break;
writer.Write( Convert.ToBoolean( fi.GetValue( parentObj ) ) );
break;
default:
Console.WriteLine( "VersionFormatter does not understand type " + typeName );
break;
Console.WriteLine( "VersionFormatter does not understand type " + typeName );
break;
}
}
}
@ -433,35 +433,35 @@ namespace lib
switch( type )
{
case ETypes.Array:
readArray( reader, obj, fi );
break;
readArray( reader, obj, fi );
break;
case ETypes.Int32:
readInt( reader, obj, fi );
break;
readInt( reader, obj, fi );
break;
case ETypes.Single:
readSingle( reader, obj, fi );
break;
readSingle( reader, obj, fi );
break;
case ETypes.Double:
readDouble( reader, obj, fi );
break;
readDouble( reader, obj, fi );
break;
case ETypes.Char:
readChar( reader, obj, fi );
break;
readChar( reader, obj, fi );
break;
case ETypes.Boolean:
readBool( reader, obj, fi );
break;
readBool( reader, obj, fi );
break;
case ETypes.String:
readString( reader, obj, fi );
break;
readString( reader, obj, fi );
break;
case ETypes.Ref:
readRef( reader, obj, fi );
break;
readRef( reader, obj, fi );
break;
case ETypes.Object:
readObject( reader );
break;
readObject( reader );
break;
default:
Debug.Fail( "Unknown type on read." );
break;
Debug.Fail( "Unknown type on read." );
break;
}
}
catch( Exception ex )

4
ser/XmlFormatter.cs
View File

@ -17,7 +17,7 @@ using System.Reflection;
namespace lib
{
//Old, use 2 now.
class XmlFormatter : IFormatter
class XmlFormatter: IFormatter
{
StreamingContext m_context;
//SerializationMode m_mode;
@ -230,7 +230,7 @@ namespace lib
}
else //More than 1.
{
//Log.error( "Too many fields named the same thing" );
//log.error( "Too many fields named the same thing" );
}
}
}

102
ser/XmlFormatter2.cs
View File

@ -29,12 +29,12 @@ namespace lib
}
public class XmlFormatter2Cfg : Config
public class XmlFormatter2Cfg: Config
{
public readonly Datastructure datastructure = Datastructure.Full;
}
public class XmlFormatter2 : IFormatter
public class XmlFormatter2: IFormatter
{
public StreamingContext Context { get; set; }
@ -95,10 +95,10 @@ namespace lib
{
//lib.log.info( "DeserializeKnownType( Stream stream, Type t ) {0} {1}", m_rndVal, m_alreadySerialized.Count );
XmlTextReader reader = new XmlTextReader( stream );
XmlTextReader reader = new XmlTextReader(stream);
//reader.Settings = System.Text.Encoding.ASCII;
object obj = Deserialize( reader, t );
object obj = Deserialize(reader, t);
//lib.log.info( "DeserializeKnownType END( Stream stream, Type t ) {0} {1}", m_rndVal, m_alreadySerialized.Count );
return obj;
}
@ -128,7 +128,7 @@ namespace lib
{
//lib.log.info( "object Deserialize( XmlElement elem ) {0} {1}", m_rndVal, m_alreadySerialized.Count );
string typename = elem.HasAttribute( "t" ) ? elem.GetAttribute( "t" ) : elem.Name;
string typename = elem.HasAttribute("t") ? elem.GetAttribute("t") : elem.Name;
return Deserialize( elem, typename );
}
@ -160,7 +160,7 @@ namespace lib
private object Deserialize( XmlElement elem, Type type, object enclosing = null )
{
TypeCode typeCode = Type.GetTypeCode( type );
TypeCode typeCode = Type.GetTypeCode(type);
if( typeCode != TypeCode.Object )
{
@ -170,7 +170,7 @@ namespace lib
{
if( !type.IsArray )
{
object obj = DeserializeObject( elem, type );
object obj = DeserializeObject(elem, type);
if( obj is I_Serialize )
{
@ -193,7 +193,7 @@ namespace lib
{
mm_types[0] = t;
var fn = GetType().GetMethod( "GetDefaultGeneric" ).MakeGenericMethod( mm_types );
var fn = GetType().GetMethod("GetDefaultGeneric").MakeGenericMethod(mm_types);
return fn.Invoke( this, null );
}
@ -205,7 +205,7 @@ namespace lib
private object DeserializeConcrete( XmlElement elem, Type type )
{
string val = elem.GetAttribute( "v" );
string val = elem.GetAttribute("v");
if( !type.IsEnum )
{
@ -244,7 +244,7 @@ namespace lib
foreach( Assembly a in ass )
{
Type t = a.GetType( shortname );
Type t = a.GetType(shortname);
if( t != null )
{
@ -255,25 +255,25 @@ namespace lib
return null;
}
private Type[] mm_consType = new Type[ 2 ];
private object[] mm_args = new object[ 2 ];
private Type[] mm_consType = new Type[2];
private object[] mm_args = new object[2];
private object DeserializeObject( XmlElement elem, Type type )
{
string refString = elem.GetAttribute( "ref" );
string refString = elem.GetAttribute("ref");
int refInt = refString.Length > 0 ? Convert.ToInt32( refString ) : -1;
int refInt = refString.Length > 0 ? Convert.ToInt32(refString) : -1;
var finalType = type;
if( elem.HasAttribute( "t" ) )
{
var typename = elem.GetAttribute( "t" );
var typename = elem.GetAttribute("t");
finalType = FindType( typename );
if( finalType == null )
finalType = type;
}
object obj = createObject( finalType, refInt );
object obj = createObject(finalType, refInt);
if( obj is IList )
{
@ -282,7 +282,7 @@ namespace lib
return DeserializeList( elem, type, list );
}
Type typeISerializable = typeof( ISerializable );
Type typeISerializable = typeof(ISerializable);
if( obj is ISerializable ) // type.IsSubclassOf( typeISerializable ) )
{
@ -290,7 +290,7 @@ namespace lib
//ISerializable ser = obj as ISerializable;
var serInfo = new SerializationInfo( finalType, new FormatterConverter() );
var serInfo = new SerializationInfo(finalType, new FormatterConverter());
//var serInfoForTypes = new SerializationInfo( type, new FormatterConverter() );
@ -302,13 +302,13 @@ namespace lib
String name = node.Name;
String childType = node.GetAttribute( "t" );
String childType = node.GetAttribute("t");
name = scr.TypeToIdentifier( name );
name = refl.TypeToIdentifier( name );
XmlElement childElem = getNamedChild( allChildren, name );
XmlElement childElem = getNamedChild(allChildren, name);
var des = Deserialize( childElem, childType );
var des = Deserialize(childElem, childType);
serInfo.AddValue( name, des, des.GetType() );
}
@ -323,7 +323,7 @@ namespace lib
mm_consType[0] = typeof( SerializationInfo );
mm_consType[1] = typeof( StreamingContext );
ConstructorInfo serCons = finalType.GetConstructor( BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, mm_consType, null );
ConstructorInfo serCons = finalType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, mm_consType, null);
mm_args[0] = serInfo;
mm_args[1] = Context;
@ -343,7 +343,7 @@ namespace lib
{
String name = serMember.Name;
name = scr.TypeToIdentifier( name );
name = refl.TypeToIdentifier( name );
XmlElement childElem = getNamedChild( allChildren, name );
@ -355,7 +355,7 @@ namespace lib
{
XmlNodeList allChildren = elem.ChildNodes;
var fields = scr.GetAllFields( type );
var fields = refl.GetAllFields(type);
//MemberInfo[] miArr = FormatterServices.GetSerializableMembers( type, Context );
@ -364,20 +364,20 @@ namespace lib
String name = childFi.Name;
name = scr.TypeToIdentifier( name );
name = refl.TypeToIdentifier( name );
XmlElement childElem = getNamedChild( allChildren, name );
XmlElement childElem = getNamedChild(allChildren, name);
if( childElem != null )
{
object childObj = Deserialize( childElem, childFi.FieldType, obj );
object childObj = Deserialize(childElem, childFi.FieldType, obj);
childFi.SetValue( obj, childObj );
}
else if( fields.Count == 1 )
{
object childObj = Deserialize( elem, childFi.FieldType, obj );
object childObj = Deserialize(elem, childFi.FieldType, obj);
childFi.SetValue( obj, childObj );
}
@ -403,7 +403,7 @@ namespace lib
{
if( arrNodeList.Item( i ) is XmlElement )
{
XmlElement arrElem = (XmlElement)arrNodeList.Item( i );
XmlElement arrElem = (XmlElement)arrNodeList.Item(i);
list.Add( Deserialize( arrElem, genT[0] ) );
}
@ -416,20 +416,20 @@ namespace lib
{
Type typeElem = type.GetElementType();
string refString = elem.GetAttribute( "ref" );
int refInt = refString.Length > 0 ? Convert.ToInt32( refString ) : -1;
string refString = elem.GetAttribute("ref");
int refInt = refString.Length > 0 ? Convert.ToInt32(refString) : -1;
XmlNodeList arrNodeList = elem.ChildNodes;
int length = arrNodeList.Count;
Array arr = createArray( typeElem, refInt, length );
Array arr = createArray(typeElem, refInt, length);
for( int i = 0; i < arr.Length; ++i )
{
if( arrNodeList.Item( i ) is XmlElement )
{
XmlElement arrElem = (XmlElement)arrNodeList.Item( i );
XmlElement arrElem = (XmlElement)arrNodeList.Item(i);
arr.SetValue( Deserialize( arrElem, typeElem ), i );
}
@ -440,14 +440,14 @@ namespace lib
private object createObject( string typename, int refInt )
{
Type type = Type.GetType( typename );
Type type = Type.GetType(typename);
return createObject( type, refInt );
}
private object createObject( Type type, int refInt )
{
TypeCode tc = Type.GetTypeCode( type );
TypeCode tc = Type.GetTypeCode(type);
if( m_cfg.datastructure == Datastructure.Full && refInt > 0 && m_alreadySerialized.ContainsKey( refInt ) )
{
@ -472,14 +472,14 @@ namespace lib
}
catch( Exception exInner )
{
lib.Log.error( $"Got exception {exInner.Message} trying to make an uninitialized object" );
log.error( $"Got exception {exInner.Message} trying to make an uninitialized object" );
}
}
if( obj == null )
{
lib.Log.warn( $"Could not create object of type {type.Name}" );
log.warn( $"Could not create object of type {type.Name}" );
return obj;
}
@ -495,14 +495,14 @@ namespace lib
private Array createArray( string elemTypename, int refInt, int length )
{
Type elemType = Type.GetType( elemTypename );
Type elemType = Type.GetType(elemTypename);
return createArray( elemType, refInt, length );
}
private Array createArray( Type elemType, int refInt, int length )
{
TypeCode elemTC = Type.GetTypeCode( elemType );
TypeCode elemTC = Type.GetTypeCode(elemType);
if( m_cfg.datastructure == Datastructure.Full && refInt > 0 && m_alreadySerialized.ContainsKey( refInt ) )
{
@ -510,7 +510,7 @@ namespace lib
}
else
{
Array arr = Array.CreateInstance( elemType, length ) ;
Array arr = Array.CreateInstance(elemType, length);
if( m_cfg.datastructure == Datastructure.Full )
{
@ -545,7 +545,7 @@ namespace lib
m_alreadySerialized.Clear();
m_objectID = new ObjectIDGenerator();
XmlTextWriter writer = new XmlTextWriter( stream, System.Text.Encoding.ASCII );
XmlTextWriter writer = new XmlTextWriter(stream, System.Text.Encoding.ASCII);
writer.Formatting = Formatting.Indented;
@ -573,7 +573,7 @@ namespace lib
{
Type type = root.GetType();
TypeCode typeCode = Type.GetTypeCode( type );
TypeCode typeCode = Type.GetTypeCode(type);
if( typeCode != TypeCode.Object )
{
@ -626,7 +626,7 @@ namespace lib
bool first;
long refInt = m_objectID.GetId( root, out first );
long refInt = m_objectID.GetId(root, out first);
if( m_cfg.datastructure == Datastructure.Full )
{
@ -644,13 +644,13 @@ namespace lib
Type type = root.GetType();
//*
Type typeISerializable = typeof( ISerializable );
Type typeISerializable = typeof(ISerializable);
if( root is ISerializable ) // type.IsSubclassOf( typeISerializable ) )
{
ISerializable ser = root as ISerializable;
var serInfo = new SerializationInfo( type, new FormatterConverter() );
var serInfo = new SerializationInfo(type, new FormatterConverter());
ser.GetObjectData( serInfo, Context );
@ -660,7 +660,7 @@ namespace lib
{
String name = serMember.Name;
name = scr.TypeToIdentifier( name );
name = refl.TypeToIdentifier( name );
Serialize( writer, serMember.Value, name, true );
}
@ -672,14 +672,14 @@ namespace lib
else
//*/
{
var fields = scr.GetAllFields( type );
var fields = refl.GetAllFields(type);
//MemberInfo[] miArr = FormatterServices.GetSerializableMembers( type, Context );
foreach( var childFi in fields )
{
object[] objs = childFi.GetCustomAttributes( typeof( NonSerializedAttribute ), true );
object[] objs = childFi.GetCustomAttributes(typeof(NonSerializedAttribute), true);
if( objs.Length > 0 )
{
@ -688,7 +688,7 @@ namespace lib
String name = childFi.Name;
name = scr.TypeToIdentifier( name );
name = refl.TypeToIdentifier( name );
Serialize( writer, childFi.GetValue( root ), name, false );
}
@ -708,7 +708,7 @@ namespace lib
bool first;
long refInt = m_objectID.GetId( root, out first );
long refInt = m_objectID.GetId(root, out first);
if( m_cfg.datastructure == Datastructure.Full )
{

4
time/Timer.cs
View File

@ -6,7 +6,7 @@ using System.Threading;
namespace lib
{
public class MicroStopwatch : System.Diagnostics.Stopwatch
public class MicroStopwatch: System.Diagnostics.Stopwatch
{
readonly double _microSecPerTick
= 1000000D / System.Diagnostics.Stopwatch.Frequency;
@ -189,7 +189,7 @@ namespace lib
/// <summary>
/// MicroTimer Event Argument class
/// </summary>
public class MicroTimerEventArgs : EventArgs
public class MicroTimerEventArgs: EventArgs
{
// Simple counter, number times timed event (callback function) executed
public int TimerCount { get; private set; }