Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Code-style clean-up on simple classes #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Code-style clean-up on simple classes #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions src/runtime/arrayobject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections;
using System.Reflection;

namespace Python.Runtime
{
Expand All @@ -22,13 +21,13 @@ internal override bool CanSubclass()

public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
{
ArrayObject self = GetManagedObject(tp) as ArrayObject;
var self = GetManagedObject(tp) as ArrayObject;
if (Runtime.PyTuple_Size(args) != 1)
{
return Exceptions.RaiseTypeError("array expects 1 argument");
}
IntPtr op = Runtime.PyTuple_GetItem(args, 0);
Object result;
object result;

if (!Converter.ToManaged(op, self.type, out result, true))
{
Expand All @@ -43,11 +42,11 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
/// </summary>
public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
{
CLRObject obj = (CLRObject)ManagedType.GetManagedObject(ob);
Array items = obj.inst as Array;
var obj = (CLRObject)GetManagedObject(ob);
var items = obj.inst as Array;
Type itemType = obj.inst.GetType().GetElementType();
int rank = items.Rank;
int index = 0;
int index;
object value;

// Note that CLR 1.0 only supports int indexes - methods to
Expand All @@ -61,7 +60,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)

if (rank == 1)
{
index = (int)Runtime.PyInt_AsLong(idx);
index = Runtime.PyInt_AsLong(idx);

if (Exceptions.ErrorOccurred())
{
Expand All @@ -83,7 +82,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
return IntPtr.Zero;
}

return Converter.ToPython(items.GetValue(index), itemType);
return Converter.ToPython(value, itemType);
}

// Multi-dimensional arrays can be indexed a la: list[1, 2, 3].
Expand All @@ -96,12 +95,12 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)

int count = Runtime.PyTuple_Size(idx);

Array args = Array.CreateInstance(typeof(Int32), count);
var args = new int[count];

for (int i = 0; i < count; i++)
for (var i = 0; i < count; i++)
{
IntPtr op = Runtime.PyTuple_GetItem(idx, i);
index = (int)Runtime.PyInt_AsLong(op);
index = Runtime.PyInt_AsLong(op);

if (Exceptions.ErrorOccurred())
{
Expand Down Expand Up @@ -135,11 +134,11 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
/// </summary>
public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
{
CLRObject obj = (CLRObject)ManagedType.GetManagedObject(ob);
Array items = obj.inst as Array;
var obj = (CLRObject)GetManagedObject(ob);
var items = obj.inst as Array;
Type itemType = obj.inst.GetType().GetElementType();
int rank = items.Rank;
int index = 0;
int index;
object value;

if (items.IsReadOnly)
Expand All @@ -155,7 +154,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)

if (rank == 1)
{
index = (int)Runtime.PyInt_AsLong(idx);
index = Runtime.PyInt_AsLong(idx);

if (Exceptions.ErrorOccurred())
{
Expand Down Expand Up @@ -188,13 +187,12 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
}

int count = Runtime.PyTuple_Size(idx);
var args = new int[count];

Array args = Array.CreateInstance(typeof(Int32), count);

for (int i = 0; i < count; i++)
for (var i = 0; i < count; i++)
{
IntPtr op = Runtime.PyTuple_GetItem(idx, i);
index = (int)Runtime.PyInt_AsLong(op);
index = Runtime.PyInt_AsLong(op);

if (Exceptions.ErrorOccurred())
{
Expand Down Expand Up @@ -229,9 +227,9 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
/// </summary>
public static int sq_contains(IntPtr ob, IntPtr v)
{
CLRObject obj = (CLRObject)ManagedType.GetManagedObject(ob);
var obj = (CLRObject)GetManagedObject(ob);
Type itemType = obj.inst.GetType().GetElementType();
IList items = obj.inst as IList;
var items = obj.inst as IList;
object value;

if (!Converter.ToManaged(v, itemType, out value, false))
Expand All @@ -253,8 +251,8 @@ public static int sq_contains(IntPtr ob, IntPtr v)
/// </summary>
public static int mp_length(IntPtr ob)
{
CLRObject self = (CLRObject)ManagedType.GetManagedObject(ob);
Array items = self.inst as Array;
var self = (CLRObject)GetManagedObject(ob);
var items = self.inst as Array;
return items.Length;
}
}
Expand Down
55 changes: 27 additions & 28 deletions src/runtime/assemblymanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ internal class AssemblyManager
//static Dictionary<string, Dictionary<string, string>> generics;
static AssemblyLoadEventHandler lhandler;
static ResolveEventHandler rhandler;

// updated only under GIL?
static Dictionary<string, int> probed;

// modified from event handlers below, potentially triggered from different .NET threads
static AssemblyList assemblies;
internal static List<string> pypath;
Expand Down Expand Up @@ -53,7 +55,7 @@ internal static void Initialize()
domain.AssemblyResolve += rhandler;

Assembly[] items = domain.GetAssemblies();
foreach (var a in items)
foreach (Assembly a in items)
{
try
{
Expand All @@ -62,7 +64,7 @@ internal static void Initialize()
}
catch (Exception ex)
{
Debug.WriteLine(string.Format("Error scanning assembly {0}. {1}", a, ex));
Debug.WriteLine("Error scanning assembly {0}. {1}", a, ex);
}
}
}
Expand All @@ -86,7 +88,7 @@ internal static void Shutdown()
/// so that we can know about assemblies that get loaded after the
/// Python runtime is initialized.
/// </summary>
static void AssemblyLoadHandler(Object ob, AssemblyLoadEventArgs args)
private static void AssemblyLoadHandler(object ob, AssemblyLoadEventArgs args)
{
Assembly assembly = args.LoadedAssembly;
assemblies.Add(assembly);
Expand All @@ -101,7 +103,7 @@ static void AssemblyLoadHandler(Object ob, AssemblyLoadEventArgs args)
/// for failed loads, because they might be dependencies of something
/// we loaded from Python which also needs to be found on PYTHONPATH.
/// </summary>
static Assembly ResolveHandler(Object ob, ResolveEventArgs args)
private static Assembly ResolveHandler(object ob, ResolveEventArgs args)
{
string name = args.Name.ToLower();
foreach (Assembly a in assemblies)
Expand Down Expand Up @@ -135,7 +137,7 @@ internal static void UpdatePath()
{
pypath.Clear();
probed.Clear();
for (int i = 0; i < count; i++)
for (var i = 0; i < count; i++)
{
IntPtr item = Runtime.PyList_GetItem(list, i);
string path = Runtime.GetManagedString(item);
Expand All @@ -159,7 +161,7 @@ public static string FindAssembly(string name)
string path;
string temp;

for (int i = 0; i < pypath.Count; i++)
for (var i = 0; i < pypath.Count; i++)
{
string head = pypath[i];
if (head == null || head.Length == 0)
Expand Down Expand Up @@ -197,7 +199,7 @@ public static Assembly LoadAssembly(string name)
{
assembly = Assembly.Load(name);
}
catch (System.Exception)
catch (Exception)
{
//if (!(e is System.IO.FileNotFoundException))
//{
Expand All @@ -221,7 +223,7 @@ public static Assembly LoadAssemblyPath(string name)
{
assembly = Assembly.LoadFrom(path);
}
catch
catch (Exception)
{
}
}
Expand All @@ -241,7 +243,9 @@ public static Assembly LoadAssemblyFullPath(string name)
if (Path.IsPathRooted(name))
{
if (!Path.HasExtension(name))
{
name = name + ".dll";
}
if (File.Exists(name))
{
try
Expand Down Expand Up @@ -287,13 +291,13 @@ public static Assembly FindLoadedAssembly(string name)
public static bool LoadImplicit(string name, bool warn = true)
{
string[] names = name.Split('.');
bool loaded = false;
string s = "";
var loaded = false;
var s = "";
Assembly lastAssembly = null;
HashSet<Assembly> assembliesSet = null;
for (int i = 0; i < names.Length; i++)
for (var i = 0; i < names.Length; i++)
{
s = (i == 0) ? names[0] : s + "." + names[i];
s = i == 0 ? names[0] : s + "." + names[i];
if (!probed.ContainsKey(s))
{
if (assembliesSet == null)
Expand Down Expand Up @@ -321,7 +325,7 @@ public static bool LoadImplicit(string name, bool warn = true)
// Deprecation warning
if (warn && loaded)
{
string deprWarning = String.Format(
string deprWarning = string.Format(
"\nThe module was found, but not in a referenced namespace.\n" +
"Implicit loading is deprecated. Please use clr.AddReference(\"{0}\").",
Path.GetFileNameWithoutExtension(lastAssembly.Location));
Expand All @@ -345,24 +349,23 @@ internal static void ScanAssembly(Assembly assembly)
// the assembly.

Type[] types = assembly.GetTypes();
for (int i = 0; i < types.Length; i++)
foreach (Type t in types)
{
Type t = types[i];
string ns = t.Namespace ?? "";
if (!namespaces.ContainsKey(ns))
{
string[] names = ns.Split('.');
string s = "";
for (int n = 0; n < names.Length; n++)
var s = "";
for (var n = 0; n < names.Length; n++)
{
s = (n == 0) ? names[0] : s + "." + names[n];
s = n == 0 ? names[0] : s + "." + names[n];
namespaces.TryAdd(s, new ConcurrentDictionary<Assembly, string>());
}
}

if (ns != null)
{
namespaces[ns].TryAdd(assembly, String.Empty);
namespaces[ns].TryAdd(assembly, string.Empty);
}

if (ns != null && t.IsGenericTypeDefinition)
Expand All @@ -374,7 +377,7 @@ internal static void ScanAssembly(Assembly assembly)

public static AssemblyName[] ListAssemblies()
{
List<AssemblyName> names = new List<AssemblyName>(assemblies.Count);
var names = new List<AssemblyName>(assemblies.Count);
foreach (Assembly assembly in assemblies)
{
names.Add(assembly.GetName());
Expand All @@ -388,18 +391,15 @@ public static AssemblyName[] ListAssemblies()
/// </summary>
public static bool IsValidNamespace(string name)
{
return !String.IsNullOrEmpty(name) && namespaces.ContainsKey(name);
return !string.IsNullOrEmpty(name) && namespaces.ContainsKey(name);
}

/// <summary>
/// Returns list of assemblies that declare types in a given namespace
/// </summary>
public static IEnumerable<Assembly> GetAssemblies(string nsname)
{
if (!namespaces.ContainsKey(nsname))
return new List<Assembly>();

return namespaces[nsname].Keys;
return !namespaces.ContainsKey(nsname) ? new List<Assembly>() : namespaces[nsname].Keys;
}

/// <summary>
Expand All @@ -408,7 +408,7 @@ public static IEnumerable<Assembly> GetAssemblies(string nsname)
public static List<string> GetNames(string nsname)
{
//Dictionary<string, int> seen = new Dictionary<string, int>();
List<string> names = new List<string>(8);
var names = new List<string>(8);

List<string> g = GenericUtil.GetGenericBaseNames(nsname);
if (g != null)
Expand All @@ -424,9 +424,8 @@ public static List<string> GetNames(string nsname)
foreach (Assembly a in namespaces[nsname].Keys)
{
Type[] types = a.GetTypes();
for (int i = 0; i < types.Length; i++)
foreach (Type t in types)
{
Type t = types[i];
if ((t.Namespace ?? "") == nsname)
{
names.Add(t.Name);
Expand Down
Loading