Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
globally rename IRakudoObject to RakudoObject etc, catch up with some… 
… dotnet/ changes
  • Loading branch information
Martin Berends committed Aug 22, 2010
1 parent c5ba12f commit ab1b7bc
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 80 deletions.
26 changes: 15 additions & 11 deletions java/runtime/Makefile
View file
Expand Up @@ -2,11 +2,10 @@

ALL_CLASSES = \
Rakudo/Metamodel/Hints.class \
Rakudo/Metamodel/IBoxableRepresentation.class \
Rakudo/Metamodel/REPRRegistry.class \
Rakudo/Serialization/SerializationContext.class \
Rakudo/Metamodel/IRakudoObject.class \
Rakudo/Metamodel/IRepresentation.class \
Rakudo/Metamodel/RakudoObject.class \
Rakudo/Metamodel/Representation.class \
Rakudo/Metamodel/SharedTable.class \
Rakudo/Metamodel/KnowHOW/KnowHOWREPR.class

Expand All @@ -16,29 +15,34 @@ all: $(ALL_CLASSES)
Rakudo/Metamodel/Hints.class: Rakudo/Metamodel/Hints.java
javac Rakudo/Metamodel/Hints.java

Rakudo/Metamodel/IBoxableRepresentation.class: Rakudo/Metamodel/IBoxableRepresentation.java
javac Rakudo/Metamodel/IBoxableRepresentation.java
#Rakudo/Metamodel/IBoxableRepresentation.class: Rakudo/Metamodel/IBoxableRepresentation.java
# javac Rakudo/Metamodel/IBoxableRepresentation.java

Rakudo/Metamodel/REPRRegistry.class: Rakudo/Metamodel/REPRRegistry.java
javac Rakudo/Metamodel/REPRRegistry.java

Rakudo/Serialization/SerializationContext.class: Rakudo/Serialization/SerializationContext.java
javac Rakudo/Serialization/SerializationContext.java

Rakudo/Metamodel/IRakudoObject.class: Rakudo/Metamodel/IRakudoObject.java \
Rakudo/Metamodel/RakudoObject.class: Rakudo/Metamodel/RakudoObject.java \
Rakudo/Serialization/SerializationContext.class
javac Rakudo/Metamodel/IRakudoObject.java
javac Rakudo/Metamodel/RakudoObject.java

Rakudo/Metamodel/IRepresentation.class: Rakudo/Metamodel/IRepresentation.java \
Rakudo/Metamodel/IRakudoObject.class
javac Rakudo/Metamodel/IRepresentation.java
Rakudo/Metamodel/Representation.class: Rakudo/Metamodel/Representation.java \
Rakudo/Metamodel/RakudoObject.class
javac Rakudo/Metamodel/Representation.java

Rakudo/Metamodel/SharedTable.class: Rakudo/Metamodel/SharedTable.java \
Rakudo/Metamodel/IRepresentation.class
Rakudo/Metamodel/Representation.class
javac Rakudo/Metamodel/SharedTable.java
# this file has the lambda expression code commented out, and needs
# to be completed urgently

Rakudo/Metamodel/KnowHOW/KnowHOWBootstrapper.class: Rakudo/Metamodel/KnowHOW/KnowHOWBootstrapper.java \
javac Rakudo/Metamodel/KnowHOW/KnowHOWBootstrapper.java
# this file has 6 lambda expressions to translate, currently suffering
# from 55 compile time errors :(

Rakudo/Metamodel/KnowHOW/KnowHOWREPR.class: Rakudo/Metamodel/KnowHOW/KnowHOWREPR.java \
Rakudo/Metamodel/Hints.class
javac Rakudo/Metamodel/KnowHOW/KnowHOWREPR.java
Expand Down
32 changes: 16 additions & 16 deletions java/runtime/Rakudo/Metamodel/KnowHOW/KnowHOWREPR.java
View file
Expand Up @@ -2,8 +2,8 @@

import java.util.*;
import Rakudo.Metamodel.Hints;
import Rakudo.Metamodel.IRakudoObject;
import Rakudo.Metamodel.IRepresentation;
import Rakudo.Metamodel.RakudoObject;
import Rakudo.Metamodel.Representation;
import Rakudo.Metamodel.SharedTable;
// One could be lazy and import Rakudo.Metamodel.*, but that would be
// less informative.
Expand All @@ -13,14 +13,14 @@
/// We have a REPR especially for the KnowHOW, which is part of the
/// "bootstrap".
/// </summary>
public class KnowHOWREPR implements IRepresentation
public class KnowHOWREPR implements Representation
{
/// <summary>
/// This represents an instance created with this underlying
/// representation. We use .Net data types for out attribute
/// and method store.
/// </summary>
public class KnowHOWInstance implements IRakudoObject
public class KnowHOWInstance implements RakudoObject
// internal class KnowHOWInstance implements IRakudoObject // the C# version
{
// public SharedTable STable { get; set; } // the C# version
Expand All @@ -33,9 +33,9 @@ public class KnowHOWInstance implements IRakudoObject
public SerializationContext getSC() { return SC; }
public void setSC( SerializationContext sc ) { SC = sc; }

public ArrayList<IRakudoObject> Attributes;
public ArrayList<RakudoObject> Attributes;
// public List<IRakudoObject> Attributes; // the C# version
public HashMap<String, IRakudoObject> Methods;
public HashMap<String, RakudoObject> Methods;
// public Dictionary<string, IRakudoObject> Methods;
public KnowHOWInstance(SharedTable STable)
{
Expand All @@ -48,7 +48,7 @@ public KnowHOWInstance(SharedTable STable)
/// </summary>
/// <param name="HOW"></param>
/// <returns></returns>
public IRakudoObject type_object_for(IRakudoObject HOW)
public RakudoObject type_object_for(RakudoObject HOW)
{
SharedTable STable = new SharedTable();
// var STable = new SharedTable();
Expand All @@ -63,12 +63,12 @@ public IRakudoObject type_object_for(IRakudoObject HOW)
/// </summary>
/// <param name="WHAT"></param>
/// <returns></returns>
public IRakudoObject instance_of(IRakudoObject WHAT)
public RakudoObject instance_of(RakudoObject WHAT)
{
KnowHOWInstance Object = new KnowHOWInstance(WHAT.getSTable());
// var Object = new KnowHOWInstance(WHAT.STable);
Object.Methods = new HashMap<String, IRakudoObject>();
Object.Attributes = new ArrayList<IRakudoObject>();
Object.Methods = new HashMap<String, RakudoObject>();
Object.Attributes = new ArrayList<RakudoObject>();
return Object;
}

Expand All @@ -77,27 +77,27 @@ public IRakudoObject instance_of(IRakudoObject WHAT)
/// </summary>
/// <param name="Obj"></param>
/// <returns></returns>
public boolean defined(IRakudoObject Obj)
public boolean defined(RakudoObject Obj)
{
return ((KnowHOWInstance)Obj).Methods != null;
}

public IRakudoObject get_attribute(IRakudoObject Object, IRakudoObject ClassHandle, String Name)
public RakudoObject get_attribute(RakudoObject Object, RakudoObject ClassHandle, String Name)
{
throw new UnsupportedOperationException();
}

public IRakudoObject get_attribute_with_hint(IRakudoObject Object, IRakudoObject ClassHandle, String Name, int Hint)
public RakudoObject get_attribute_with_hint(RakudoObject Object, RakudoObject ClassHandle, String Name, int Hint)
{
throw new UnsupportedOperationException();
}

public void bind_attribute(IRakudoObject Object, IRakudoObject ClassHandle, String Name, IRakudoObject Value)
public void bind_attribute(RakudoObject Object, RakudoObject ClassHandle, String Name, RakudoObject Value)
{
throw new UnsupportedOperationException();
}

public void bind_attribute_with_hint(IRakudoObject Object, IRakudoObject ClassHandle, String Name, int Hint, IRakudoObject Value)
public void bind_attribute_with_hint(RakudoObject Object, RakudoObject ClassHandle, String Name, int Hint, RakudoObject Value)
{
throw new UnsupportedOperationException();
}
Expand All @@ -109,7 +109,7 @@ public void bind_attribute_with_hint(IRakudoObject Object, IRakudoObject ClassHa
/// <param name="ClassHandle"></param>
/// <param name="Name"></param>
/// <returns></returns>
public int hint_for(IRakudoObject ClassHandle, String Name)
public int hint_for(RakudoObject ClassHandle, String Name)
{
return Hints.NO_HINT;
}
Expand Down
8 changes: 4 additions & 4 deletions java/runtime/Rakudo/Metamodel/REPRRegistry.java
View file
Expand Up @@ -11,7 +11,7 @@ public class REPRRegistry
/// <summary>
/// ID indexed list.
/// </summary>
private static ArrayList<IRepresentation> Registry = new ArrayList<IRepresentation>();
private static ArrayList<Representation> Registry = new ArrayList<Representation>();
// private static List<IRepresentation> Registry = new List<IRepresentation>(); // the C# version

/// <summary>
Expand All @@ -27,7 +27,7 @@ public class REPRRegistry
/// <param name="Name"></param>
/// <param name="REPR"></param>
/// <returns></returns>
public static int register_REPR(String Name, IRepresentation REPR)
public static int register_REPR(String Name, Representation REPR)
{
Registry.add(REPR);
int ID = Registry.size() - 1;
Expand All @@ -40,7 +40,7 @@ public static int register_REPR(String Name, IRepresentation REPR)
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public static IRepresentation get_REPR_by_id(int ID)
public static Representation get_REPR_by_id(int ID)
{
return Registry.get( new Integer(ID) );
}
Expand All @@ -50,7 +50,7 @@ public static IRepresentation get_REPR_by_id(int ID)
/// </summary>
/// <param name="Name"></param>
/// <returns></returns>
public static IRepresentation get_REPR_by_name(String Name)
public static Representation get_REPR_by_name(String Name)
{
return Registry.get( NamedToIDMapper.get(Name) );
}
Expand Down
7 changes: 3 additions & 4 deletions ...ntime/Rakudo/Metamodel/IRakudoObject.java → ...untime/Rakudo/Metamodel/RakudoObject.java
View file
Expand Up @@ -5,22 +5,21 @@
/// <summary>
/// The commonalities of every object.
/// </summary>
public interface IRakudoObject
public interface RakudoObject
{

/// <summary>
/// Every object must have a way to refer to the shared table,
/// which contains the commonalities this object has.
/// </summary>
// SharedTable STable { get; set; } // the C# version
SharedTable getSTable();
void setSTable( SharedTable st );
// SharedTable STable { get; set; } // the C# version

/// <summary>
/// The serialization context this object belongs to.
/// </summary>
//SerializationContext SC { get; set; } // the C# version
SerializationContext getSC();
void setSC( SerializationContext sc );
// SerializationContext SC { get; set; } // the C# version
}

21 changes: 11 additions & 10 deletions ...ime/Rakudo/Metamodel/IRepresentation.java → ...time/Rakudo/Metamodel/Representation.java
View file
@@ -1,11 +1,11 @@
package Rakudo.Metamodel;

import Rakudo.Metamodel.IRakudoObject;
import Rakudo.Metamodel.RakudoObject;

/// <summary>
/// All representations should implement this API.
/// </summary>
public interface IRepresentation
public interface Representation
{
/// <summary>
/// Creates a new type object of this representation, and
Expand All @@ -14,29 +14,29 @@ public interface IRepresentation
/// </summary>
/// <param name="HOW"></param>
/// <returns></returns>
IRakudoObject type_object_for(IRakudoObject HOW);
RakudoObject type_object_for(RakudoObject HOW);

/// <summary>
/// Creates a new instance based on the type object.
/// </summary>
/// <param name="WHAT"></param>
/// <returns></returns>
IRakudoObject instance_of(IRakudoObject WHAT);
RakudoObject instance_of(RakudoObject WHAT);

/// <summary>
/// Checks if a given object is defined.
/// </summary>
/// <param name="Obj"></param>
/// <returns></returns>
boolean defined(IRakudoObject Obj);
boolean defined(RakudoObject Obj);

/// <summary>
/// Gets the current value for an attribute.
/// </summary>
/// <param name="ClassHandle"></param>
/// <param name="Name"></param>
/// <returns></returns>
IRakudoObject get_attribute(IRakudoObject Object, IRakudoObject ClassHandle, String Name);
RakudoObject get_attribute(RakudoObject Object, RakudoObject ClassHandle, String Name);

/// <summary>
/// Gets the current value for an attribute, obtained using the
Expand All @@ -46,15 +46,15 @@ public interface IRepresentation
/// <param name="Name"></param>
/// <param name="Hint"></param>
/// <returns></returns>
IRakudoObject get_attribute_with_hint(IRakudoObject Object, IRakudoObject ClassHandle, String Name, int Hint);
RakudoObject get_attribute_with_hint(RakudoObject Object, RakudoObject ClassHandle, String Name, int Hint);

/// <summary>
/// Binds the given value to the specified attribute.
/// </summary>
/// <param name="ClassHandle"></param>
/// <param name="Name"></param>
/// <param name="Value"></param>
void bind_attribute(IRakudoObject Object, IRakudoObject ClassHandle, String Name, IRakudoObject Value);
void bind_attribute(RakudoObject Object, RakudoObject ClassHandle, String Name, RakudoObject Value);

/// <summary>
/// Binds the given value to the specified attribute, using the
Expand All @@ -64,13 +64,14 @@ public interface IRepresentation
/// <param name="Name"></param>
/// <param name="Hint"></param>
/// <param name="Value"></param>
void bind_attribute_with_hint(IRakudoObject Object, IRakudoObject ClassHandle, String Name, int Hint, IRakudoObject Value);
void bind_attribute_with_hint(RakudoObject Object, RakudoObject ClassHandle, String Name, int Hint, RakudoObject Value);

/// <summary>
/// Gets the hint for the given attribute ID.
/// </summary>
/// <param name="ClassHandle"></param>
/// <param name="Name"></param>
/// <returns></returns>
int hint_for(IRakudoObject ClassHandle, String Name);
int hint_for(RakudoObject ClassHandle, String Name);
}

0 comments on commit ab1b7bc

Please sign in to comment.