v) throws E;
-
+
/**
* This method computes logical equality between IValues. That means that it
- * may equalize objects implemented by different classes implementing the
+ * may equalize objects implemented by different classes implementing the
* same interface. It does uphold Java's equals/hashCode contract, nevertheless.
- *
+ *
* In particular, lazy intermediate representations of IList, ISet or IString would
* lead to IValue objects being equal even though their internal structure differs greatly.
* Implementors should think hard how to uphold equals/hashCode contract in such cases.
- *
+ *
* A note on subtitutability: given that IValue's are immutable, and this equals method
* implements an equivalence relation and that it upholds the hashCode/equals contract:
* if equals(a,b) then a is substitutable for b and vice versa in _any_ context. This implies
- * full referential transparancy as well.
- *
+ * full referential transparancy as well.
+ *
* On the computational complexity of equals: although equality is worst case linear,
- * implementations are expected to fail fast, and succeed fast. In particular the implementations
- * based on persistent and shared data-structures are expected to test for reference equality at every
- * level in a value. The expected/average complexity of equals should be around log(size), as a result.
- *
+ * implementations are expected to fail fast, and succeed fast. In particular the implementations
+ * based on persistent and shared data-structures are expected to test for reference equality at every
+ * level in a value. The expected/average complexity of equals should be around log(size), as a result.
+ *
* @param other object to compare to
* @return true iff the other value is logically equal to the receiver object
*/
@Override
public boolean equals(@Nullable Object other);
-
+
/**
* Another notion of equality which ignores secondary information:
- * namely, keyword parameters (either top-level or deeply nested).
- *
+ * namely, keyword parameters (either top-level or deeply nested).
+ *
* The intention is for this notion of equality to match what the notion of pattern
* matching is in the Rascal language. In this case the receiver acts
* as a "pattern" for the argument.
- *
+ *
* The following theories hold:
- *
+ *
*
- . a.equals(b) ==> a.match(b) // and not the inverse
* - match() is an equivalence relation
*
- *
+ *
* Note that the match() algorithm is linear in the size of the smallest of the
* two values, but implementations are expected to fail fast and succeed fast where
* possible (checking for reference equality on the way).
- *
+ *
* @param other value to compare to
* @return true iff the other value is equal to the other value, while
- * ignoring all "non-structural" details such the presence of keyword
+ * ignoring all "non-structural" details such the presence of keyword
* parameters.
*/
public default boolean match(IValue other) {
return equals(other);
}
-
+
/**
* Prints the value to a string using the {@link StandardTextWriter}
*/
public String toString();
-
+
/**
* @return if this {@link IValue} object may have keyword parameters
*/
public default boolean mayHaveKeywordParameters() {
return false;
}
-
+
/**
- * Creates a view that exposes the {@link IWithKeywordParameters} annotation API.
- *
- * @return an {@link IWithKeywordParameters} view on this {@link IValue} object
+ * Creates a view that exposes the {@link IWithKeywordParameters} annotation API.
+ *
+ * @return an {@link IWithKeywordParameters} view on this {@link IValue} object
*/
public default IWithKeywordParameters asWithKeywordParameters() {
throw new UnsupportedOperationException(getType() + " does not support keyword parameters.");
}
-
+
/**
* This is how all IValue implementations should be printed.
* @return the literal expression format of the value as a string
diff --git a/src/main/java/io/usethesource/vallang/IValueFactory.java b/src/main/java/io/usethesource/vallang/IValueFactory.java
index f126af417..1653b8614 100644
--- a/src/main/java/io/usethesource/vallang/IValueFactory.java
+++ b/src/main/java/io/usethesource/vallang/IValueFactory.java
@@ -26,607 +26,607 @@
* class should guarantee that the values returned are immutable. For batch
* construction of container classes there should be implementations of the
* I{List,Set,Relation,Map}Writer interfaces.
- *
+ *
* @author jurgen@vinju.org
* @author rfuhrer@watson.ibm.com
- *
+ *
*/
public interface IValueFactory {
- /**
- * Constructs an integer from the decimal representation.
- *
- * @param i
- * integer as a string of decimal digits
- * @return a new integer
- * @throws NumberFormatException
- */
- public IInteger integer(String i) throws NumberFormatException;
-
- /**
- * @param i
- * @return a value representing the integer i, with type IntegerType
- */
- public IInteger integer(int i);
-
- /**
- * @param i
- * @return a value representing the integer i, with type IntegerType
- */
- public IInteger integer(long i);
-
- /**
- * Construct an integer from the two's complement big-endian representation
- *
- * @param a
- * @return a value representing the two's complement notation in a
- */
- public IInteger integer(byte[] a);
-
- /**
- * @param a
- * @param b
- * @return a value representing the rational a/b, with type RationalType
- */
- public IRational rational(int a, int b);
-
- /**
- * @param a
- * @param b
- * @return a value representing the rational a/b, with type RationalType
- */
- public IRational rational(long a, long b);
-
- /**
- * @param a
- * @param b
- * @return a value representing the rational a/b, with type RationalType
- */
- public IRational rational(IInteger a, IInteger b);
-
- /**
- * @param rat
- * @return a value representing the rational rat, with type RationalType
- */
- public IRational rational(String rat) throws NumberFormatException;
-
- /**
- * Construct a real from the mathematical notation.
- *
- * @param s
- * real as a string in decimal mathematical notation.
- * @return the corresponding real
- * @throws NumberFormatException
- */
- public IReal real(String s) throws NumberFormatException;
-
- /**
- * Construct a real from the mathematical notation.
- *
- * @param s
- * real as a string in decimal mathematical notation.
- * @param p
- * precision
- * @return the corresponding real
- * @throws NumberFormatException
- */
- public IReal real(String s, int p) throws NumberFormatException;
-
- /**
- * @param d
- * @return a value representing the double d, with type RealType
- */
- public IReal real(double d);
-
- /**
- * @param d
- * @param p
- * precision
- * @return a value representing the double d, with type RealType
- */
- public IReal real(double d, int p);
-
- /**
- * @return the global precision for reals
- */
- public int getPrecision();
-
- /**
- * Set the global precision for reals
- *
- * @param p
- * @return the previous global precision
- */
- public int setPrecision(int p);
-
- /**
- * @param precision
- * (max of 1000)
- * @return PI with a higher precision than standard Math.PI
- */
- public IReal pi(int precision);
-
- /**
- * @param precision
- * (max of 1000)
- * @return E with a higher precision than standard Math.E
- */
- public IReal e(int precision);
-
- /**
- * @param s
- * @return a value representing the string s, with type StringType
- */
- public IString string(String s);
-
- /**
- * Build a string from an array of unicode characters.
- *
- * @param chars
- * array of unicode characters
- * @throws IllegalArgumentException
- * if one of the characters in chars is not a valid codePoint
- */
- public IString string(int[] chars) throws IllegalArgumentException;
-
- /**
- * Build a string from a unicode character.
- *
- * @param ch
- * unicode character
- * @throws IllegalArgumentException
- * when ch is not a valid codePoint
- */
- public IString string(int ch) throws IllegalArgumentException;
-
- /**
- * Create an exact reference to a source location.
- *
- * @param uri
- * exact uri where the source is located.
- * @param offset
- * the character offset starting from the beginning of the file
- * located at the given url. Offsets start at 0 (zero).
- * @param length
- * the character length of the location (the amount characters).
- * @param beginLine
- * the (inclusive) line number where the location begins. The
- * first line is always line number 1.
- * @param endLine
- * the (exclusive) line where the location ends
- * @param beginCol
- * the (inclusive) column number where the location begins. The
- * first column is always column number 0 (zero).
- * @param endCol
- * the (exclusive) column number where the location ends.
- * @return a value representing a source location, with type
- * SourceLocationType
- * @deprecated please use the overload with a ISourceLocation
- */
- @Deprecated
- public ISourceLocation sourceLocation(URI uri, int offset, int length,
- int beginLine, int endLine, int beginCol, int endCol);
-
- /**
- * Create an exact reference to a source location.
- *
- * @param loc
- * where the source is located. (only the location part of the source location is used)
- * @param offset
- * the character offset starting from the beginning of the file
- * located at the given url. Offsets start at 0 (zero).
- * @param length
- * the character length of the location (the amount characters).
- * @param beginLine
- * the (inclusive) line number where the location begins. The
- * first line is always line number 1.
- * @param endLine
- * the (exclusive) line where the location ends
- * @param beginCol
- * the (inclusive) column number where the location begins. The
- * first column is always column number 0 (zero).
- * @param endCol
- * the (exclusive) column number where the location ends.
- * @return a value representing a source location, with type
- * SourceLocationType
- */
- public ISourceLocation sourceLocation(ISourceLocation loc, int offset,
- int length, int beginLine, int endLine, int beginCol, int endCol);
-
- /**
- * Create an exact reference to a source location.
- *
- * @param uri
- * exact uri where the source is located.
- * @param offset
- * the character offset starting from the beginning of the file
- * located at the given url. Offsets start at 0 (zero).
- * @param length
- * the character length of the location (the amount characters).
- *
- * @return a value representing a source location, with type
- * SourceLocationType
- * @deprecated please use the overload with a ISourceLocation
- */
- @Deprecated
- public ISourceLocation sourceLocation(URI uri, int offset, int length);
-
- /**
- * Create an exact reference to a source location.
- *
- * @param loc
- * where the source is located. (only the location part of the source location is used)
- * @param offset
- * the character offset starting from the beginning of the file
- * located at the given url. Offsets start at 0 (zero).
- * @param length
- * the character length of the location (the amount characters).
- *
- * @return a value representing a source location, with type
- * SourceLocationType
- */
- public ISourceLocation sourceLocation(ISourceLocation loc, int offset, int length);
-
- /**
- * Create an exact reference to a source location.
- *
- * @param path
- * exact (absolute) path where the source is located.
- * @param offset
- * the character offset starting from the beginning of the file
- * located at the given url. Offsets start at 0 (zero).
- * @param length
- * the character length of the location (the amount characters).
- * @param beginLine
- * the (inclusive) line number where the location begins. The
- * first line is always line number 1.
- * @param endLine
- * the (exclusive) line where the location ends
- * @param beginCol
- * the (inclusive) column number where the location begins. The
- * first column is always column number 0 (zero).
- * @param endCol
- * the (exclusive) column number where the location ends.
- * @return a value representing a source location, with type
- * SourceLocationType
- */
- public ISourceLocation sourceLocation(String path, int offset, int length,
- int beginLine, int endLine, int beginCol, int endCol);
-
- /**
- * Create an exact reference to a source location.
- *
- * @param uri
- * exact uri where the source is located.
- * @return a value representing a source location, with type
- * SourceLocationType
- */
- public ISourceLocation sourceLocation(URI uri);
-
- /**
- * Create an exact reference to a source location
- *
- * note that we assume non-encoded input
- *
- * @param scheme
- * the scheme part of an source location
- * @param authority
- * the authority part of an source location
- * @param path
- * the path part of an source location
- * @return
- */
- public ISourceLocation sourceLocation(String scheme, String authority, String path) throws URISyntaxException;
-
- /**
- * Create an exact reference to a source location
- *
- * note that we assume non-encoded input
- *
- * @param scheme
- * the scheme part of an source location
- * @param authority
- * the authority part of an source location
- * @param path
- * the path part of an source location
- * @param query
- * the query part of an source location
- * @param fragment
- * the fragment part of an source location
- * @return
- */
- public ISourceLocation sourceLocation(String scheme, String authority,
- String path, @Nullable String query, @Nullable String fragment)
- throws URISyntaxException;
-
- /**
- * Create an exact reference to a source location.
- *
- * @param path
- * exact (absolute) path where the source is located.
- * @return a value representing a source location, with type
- * SourceLocationType
- */
- public ISourceLocation sourceLocation(String path);
-
- /**
- * Construct the nullary tuple
- *
- * @return the nullary tuple
- */
- public ITuple tuple();
-
- /**
- * Construct a tuple
- *
- * @param args
- * a variable length argument list or an array of IValue
- * @return a tuple with as many children as there are args
- */
- public ITuple tuple(IValue... args);
-
- /**
- * Construct a nullary generic tree node
- *
- * @param name
- * the name of the tree node
- * @return a new tree value
- */
- public INode node(String name);
-
- /**
- * Construct a node
- *
- * @param name
- * the name of the node
- * @param children
- * the edges (children) of the node
- * @return a new tree node
- */
- public INode node(String name, IValue... children);
-
- /**
- * Construct a node with keyword arguments
- *
- * @param name
- * the name of the node
- * @param keyArgValues
- * to immediately put on the constructor
- * @param keyArgValues
- * the keyword parameters with their values
- * @param children
- * an array or variable length argument list of children
- * @return a new tree value
- * @throws FactTypeUseException
- * if the children are not of the expected types for this node
- * type
- */
- public INode node(String name, IValue[] children, Map keyArgValues);
-
- /**
- * Make a nullary constructor (a typed nullary node)
- *
- * @param constructor
- * the constructor to use
- * @return a new constructor value
- */
- public IConstructor constructor(Type constructor);
-
- /**
- * Make a constructor value.
- *
- * @param constructor
- * the constructor to use
- * @param children
- * an array or variable length argument list of children
- * @return a new tree value
- * @throws FactTypeUseException
- * if the children are not of the expected types for this node
- * type
- */
- public IConstructor constructor(Type constructor, IValue... children);
-
- /**
- * Make a constructor value with keyword parameters
- *
- * @param constructor
- * the constructor to use
- * @param children
- * an array or variable length argument list of children
- * @param kwParams keyword parameters
- * @return a new tree value
- * @throws FactTypeUseException
- * if the children are not of the expected types for this node
- * type
- */
- public IConstructor constructor(Type constructor, IValue[] children, Map kwParams);
-
- /**
- * Get a set writer of which the element type will be the least upper bound
- * of the element types
- *
- * @return a set writer
- */
- public ISetWriter setWriter();
-
- /**
- * Construct a set with a fixed number of elements in it. If the elements
- * are compatible tuples, this will construct a relation.
- *
- * @param elems
- * an array or variable argument list of values
- * @return a set containing all the elements
- */
- public ISet set(IValue... elems);
-
- /**
- * Get a list writer of which the element type will be the least upper bound
- * of the element types
- *
- * @return a list writer
- */
- public IListWriter listWriter();
-
- /**
- * Construct a list with a fixed number of elements in it.
- *
- * @param elems
- * the elements to put in the list
- * @return a list [a] of type list[a.getType()]
- */
- public IList list(IValue... elems);
-
- /**
- * Get a map writer of which the key and value types will be the least upper
- * bound of the keys and values that are put in.
- *
- * @return a list writer
- */
- public IMapWriter mapWriter();
-
- /**
- * @return an empty map
- */
- public default IMap map() {
- return mapWriter().done();
- }
-
- /**
- * Create a boolean with a certain value
- *
- * @return a boolean
- */
- public IBool bool(boolean value);
-
- /**
- * Create a new DateTime representing a date with the given date fields
- *
- * @param year
- * the year of the date
- * @param month
- * the month of the date
- * @param day
- * the day of the date
- *
- * @return a DateTime date with the provided year, month, and day
- */
- public IDateTime date(int year, int month, int day);
-
- /**
- * Create a new DateTime representing a time with the given time fields
- *
- * @param hour
- * the hour of the time
- * @param minute
- * the minute of the time
- * @param second
- * the second of the time
- * @param millisecond
- * the millisecond of the time
- *
- * @return a DateTime time with the provided hour, minute, second, and
- * milliseconds
- */
- public IDateTime time(int hour, int minute, int second, int millisecond);
-
- /**
- * Create a new DateTime representing a time with the given time fields
- *
- * @param hour
- * the hour of the time
- * @param minute
- * the minute of the time
- * @param second
- * the second of the time
- * @param millisecond
- * the millisecond of the time
- * @param hourOffset
- * the hour offset of the timezone for this time (can be
- * negative)
- * @param minuteOffset
- * the minute offset of the timezone for this time (can be
- * negative if the hourOffset is 0)
- *
- * @return a DateTime time with the provided hour, minute, second,
- * milliseconds, and timezone offset
- */
- public IDateTime time(int hour, int minute, int second, int millisecond,
- int hourOffset, int minuteOffset);
-
- /**
- * Create a new DateTime with the given date and time fields
- *
- * @param year
- * the year of the date
- * @param month
- * the month of the date
- * @param day
- * the day of the date
- * @param hour
- * the hour of the time
- * @param minute
- * the minute of the time
- * @param second
- * the second of the time
- * @param millisecond
- * the millisecond of the time
- *
- * @return a DateTime with the values for year, month, etc provided in the
- * parameters
- */
- public IDateTime datetime(int year, int month, int day, int hour,
- int minute, int second, int millisecond);
-
- /**
- * Create a new DateTime with the given date and time fields
- *
- * @param year
- * the year of the date
- * @param month
- * the month of the date
- * @param day
- * the day of the date
- * @param hour
- * the hour of the time
- * @param minute
- * the minute of the time
- * @param second
- * the second of the time
- * @param millisecond
- * the millisecond of the time
- * @param hourOffset
- * the hour offset of the timezone for this time (can be
- * negative)
- * @param minuteOffset
- * the minute offset of the timezone for this time (can be
- * negative if the hourOffset is 0)
- *
- * @return a DateTime with the values for year, month, etc provided in the
- * parameters
- */
- public IDateTime datetime(int year, int month, int day, int hour,
- int minute, int second, int millisecond, int hourOffset,
- int minuteOffset);
-
- /**
- * Create a new DateTime representing the given instant.
- *
- * @param instant
- * the instant in time, according to the Java epoch
- *
- * @return a DateTime set to the given instant in time
- */
- public IDateTime datetime(long instant);
-
- /**
- * Create a new DateTime representing the given instant.
- *
- * @param instant
- * the instant in time, according to the Java epoch
- * @param timezoneHours The hour offset for the new object's timezone
- * @param timezoneMinutes The minute offset for the new object's timezone
- *
- * @return a DateTime set to the given instant in time
- */
- public IDateTime datetime(long instant, int timezoneHours, int timezoneMinutes);
+ /**
+ * Constructs an integer from the decimal representation.
+ *
+ * @param i
+ * integer as a string of decimal digits
+ * @return a new integer
+ * @throws NumberFormatException
+ */
+ public IInteger integer(String i) throws NumberFormatException;
+
+ /**
+ * @param i
+ * @return a value representing the integer i, with type IntegerType
+ */
+ public IInteger integer(int i);
+
+ /**
+ * @param i
+ * @return a value representing the integer i, with type IntegerType
+ */
+ public IInteger integer(long i);
+
+ /**
+ * Construct an integer from the two's complement big-endian representation
+ *
+ * @param a
+ * @return a value representing the two's complement notation in a
+ */
+ public IInteger integer(byte[] a);
+
+ /**
+ * @param a
+ * @param b
+ * @return a value representing the rational a/b, with type RationalType
+ */
+ public IRational rational(int a, int b);
+
+ /**
+ * @param a
+ * @param b
+ * @return a value representing the rational a/b, with type RationalType
+ */
+ public IRational rational(long a, long b);
+
+ /**
+ * @param a
+ * @param b
+ * @return a value representing the rational a/b, with type RationalType
+ */
+ public IRational rational(IInteger a, IInteger b);
+
+ /**
+ * @param rat
+ * @return a value representing the rational rat, with type RationalType
+ */
+ public IRational rational(String rat) throws NumberFormatException;
+
+ /**
+ * Construct a real from the mathematical notation.
+ *
+ * @param s
+ * real as a string in decimal mathematical notation.
+ * @return the corresponding real
+ * @throws NumberFormatException
+ */
+ public IReal real(String s) throws NumberFormatException;
+
+ /**
+ * Construct a real from the mathematical notation.
+ *
+ * @param s
+ * real as a string in decimal mathematical notation.
+ * @param p
+ * precision
+ * @return the corresponding real
+ * @throws NumberFormatException
+ */
+ public IReal real(String s, int p) throws NumberFormatException;
+
+ /**
+ * @param d
+ * @return a value representing the double d, with type RealType
+ */
+ public IReal real(double d);
+
+ /**
+ * @param d
+ * @param p
+ * precision
+ * @return a value representing the double d, with type RealType
+ */
+ public IReal real(double d, int p);
+
+ /**
+ * @return the global precision for reals
+ */
+ public int getPrecision();
+
+ /**
+ * Set the global precision for reals
+ *
+ * @param p
+ * @return the previous global precision
+ */
+ public int setPrecision(int p);
+
+ /**
+ * @param precision
+ * (max of 1000)
+ * @return PI with a higher precision than standard Math.PI
+ */
+ public IReal pi(int precision);
+
+ /**
+ * @param precision
+ * (max of 1000)
+ * @return E with a higher precision than standard Math.E
+ */
+ public IReal e(int precision);
+
+ /**
+ * @param s
+ * @return a value representing the string s, with type StringType
+ */
+ public IString string(String s);
+
+ /**
+ * Build a string from an array of unicode characters.
+ *
+ * @param chars
+ * array of unicode characters
+ * @throws IllegalArgumentException
+ * if one of the characters in chars is not a valid codePoint
+ */
+ public IString string(int[] chars) throws IllegalArgumentException;
+
+ /**
+ * Build a string from a unicode character.
+ *
+ * @param ch
+ * unicode character
+ * @throws IllegalArgumentException
+ * when ch is not a valid codePoint
+ */
+ public IString string(int ch) throws IllegalArgumentException;
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param uri
+ * exact uri where the source is located.
+ * @param offset
+ * the character offset starting from the beginning of the file
+ * located at the given url. Offsets start at 0 (zero).
+ * @param length
+ * the character length of the location (the amount characters).
+ * @param beginLine
+ * the (inclusive) line number where the location begins. The
+ * first line is always line number 1.
+ * @param endLine
+ * the (exclusive) line where the location ends
+ * @param beginCol
+ * the (inclusive) column number where the location begins. The
+ * first column is always column number 0 (zero).
+ * @param endCol
+ * the (exclusive) column number where the location ends.
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ * @deprecated please use the overload with a ISourceLocation
+ */
+ @Deprecated
+ public ISourceLocation sourceLocation(URI uri, int offset, int length,
+ int beginLine, int endLine, int beginCol, int endCol);
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param loc
+ * where the source is located. (only the location part of the source location is used)
+ * @param offset
+ * the character offset starting from the beginning of the file
+ * located at the given url. Offsets start at 0 (zero).
+ * @param length
+ * the character length of the location (the amount characters).
+ * @param beginLine
+ * the (inclusive) line number where the location begins. The
+ * first line is always line number 1.
+ * @param endLine
+ * the (exclusive) line where the location ends
+ * @param beginCol
+ * the (inclusive) column number where the location begins. The
+ * first column is always column number 0 (zero).
+ * @param endCol
+ * the (exclusive) column number where the location ends.
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ */
+ public ISourceLocation sourceLocation(ISourceLocation loc, int offset,
+ int length, int beginLine, int endLine, int beginCol, int endCol);
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param uri
+ * exact uri where the source is located.
+ * @param offset
+ * the character offset starting from the beginning of the file
+ * located at the given url. Offsets start at 0 (zero).
+ * @param length
+ * the character length of the location (the amount characters).
+ *
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ * @deprecated please use the overload with a ISourceLocation
+ */
+ @Deprecated
+ public ISourceLocation sourceLocation(URI uri, int offset, int length);
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param loc
+ * where the source is located. (only the location part of the source location is used)
+ * @param offset
+ * the character offset starting from the beginning of the file
+ * located at the given url. Offsets start at 0 (zero).
+ * @param length
+ * the character length of the location (the amount characters).
+ *
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ */
+ public ISourceLocation sourceLocation(ISourceLocation loc, int offset, int length);
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param path
+ * exact (absolute) path where the source is located.
+ * @param offset
+ * the character offset starting from the beginning of the file
+ * located at the given url. Offsets start at 0 (zero).
+ * @param length
+ * the character length of the location (the amount characters).
+ * @param beginLine
+ * the (inclusive) line number where the location begins. The
+ * first line is always line number 1.
+ * @param endLine
+ * the (exclusive) line where the location ends
+ * @param beginCol
+ * the (inclusive) column number where the location begins. The
+ * first column is always column number 0 (zero).
+ * @param endCol
+ * the (exclusive) column number where the location ends.
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ */
+ public ISourceLocation sourceLocation(String path, int offset, int length,
+ int beginLine, int endLine, int beginCol, int endCol);
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param uri
+ * exact uri where the source is located.
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ */
+ public ISourceLocation sourceLocation(URI uri);
+
+ /**
+ * Create an exact reference to a source location
+ *
+ * note that we assume non-encoded input
+ *
+ * @param scheme
+ * the scheme part of an source location
+ * @param authority
+ * the authority part of an source location
+ * @param path
+ * the path part of an source location
+ * @return
+ */
+ public ISourceLocation sourceLocation(String scheme, String authority, String path) throws URISyntaxException;
+
+ /**
+ * Create an exact reference to a source location
+ *
+ * note that we assume non-encoded input
+ *
+ * @param scheme
+ * the scheme part of an source location
+ * @param authority
+ * the authority part of an source location
+ * @param path
+ * the path part of an source location
+ * @param query
+ * the query part of an source location
+ * @param fragment
+ * the fragment part of an source location
+ * @return
+ */
+ public ISourceLocation sourceLocation(String scheme, String authority,
+ String path, @Nullable String query, @Nullable String fragment)
+ throws URISyntaxException;
+
+ /**
+ * Create an exact reference to a source location.
+ *
+ * @param path
+ * exact (absolute) path where the source is located.
+ * @return a value representing a source location, with type
+ * SourceLocationType
+ */
+ public ISourceLocation sourceLocation(String path);
+
+ /**
+ * Construct the nullary tuple
+ *
+ * @return the nullary tuple
+ */
+ public ITuple tuple();
+
+ /**
+ * Construct a tuple
+ *
+ * @param args
+ * a variable length argument list or an array of IValue
+ * @return a tuple with as many children as there are args
+ */
+ public ITuple tuple(IValue... args);
+
+ /**
+ * Construct a nullary generic tree node
+ *
+ * @param name
+ * the name of the tree node
+ * @return a new tree value
+ */
+ public INode node(String name);
+
+ /**
+ * Construct a node
+ *
+ * @param name
+ * the name of the node
+ * @param children
+ * the edges (children) of the node
+ * @return a new tree node
+ */
+ public INode node(String name, IValue... children);
+
+ /**
+ * Construct a node with keyword arguments
+ *
+ * @param name
+ * the name of the node
+ * @param keyArgValues
+ * to immediately put on the constructor
+ * @param keyArgValues
+ * the keyword parameters with their values
+ * @param children
+ * an array or variable length argument list of children
+ * @return a new tree value
+ * @throws FactTypeUseException
+ * if the children are not of the expected types for this node
+ * type
+ */
+ public INode node(String name, IValue[] children, Map keyArgValues);
+
+ /**
+ * Make a nullary constructor (a typed nullary node)
+ *
+ * @param constructor
+ * the constructor to use
+ * @return a new constructor value
+ */
+ public IConstructor constructor(Type constructor);
+
+ /**
+ * Make a constructor value.
+ *
+ * @param constructor
+ * the constructor to use
+ * @param children
+ * an array or variable length argument list of children
+ * @return a new tree value
+ * @throws FactTypeUseException
+ * if the children are not of the expected types for this node
+ * type
+ */
+ public IConstructor constructor(Type constructor, IValue... children);
+
+ /**
+ * Make a constructor value with keyword parameters
+ *
+ * @param constructor
+ * the constructor to use
+ * @param children
+ * an array or variable length argument list of children
+ * @param kwParams keyword parameters
+ * @return a new tree value
+ * @throws FactTypeUseException
+ * if the children are not of the expected types for this node
+ * type
+ */
+ public IConstructor constructor(Type constructor, IValue[] children, Map kwParams);
+
+ /**
+ * Get a set writer of which the element type will be the least upper bound
+ * of the element types
+ *
+ * @return a set writer
+ */
+ public ISetWriter setWriter();
+
+ /**
+ * Construct a set with a fixed number of elements in it. If the elements
+ * are compatible tuples, this will construct a relation.
+ *
+ * @param elems
+ * an array or variable argument list of values
+ * @return a set containing all the elements
+ */
+ public ISet set(IValue... elems);
+
+ /**
+ * Get a list writer of which the element type will be the least upper bound
+ * of the element types
+ *
+ * @return a list writer
+ */
+ public IListWriter listWriter();
+
+ /**
+ * Construct a list with a fixed number of elements in it.
+ *
+ * @param elems
+ * the elements to put in the list
+ * @return a list [a] of type list[a.getType()]
+ */
+ public IList list(IValue... elems);
+
+ /**
+ * Get a map writer of which the key and value types will be the least upper
+ * bound of the keys and values that are put in.
+ *
+ * @return a list writer
+ */
+ public IMapWriter mapWriter();
+
+ /**
+ * @return an empty map
+ */
+ public default IMap map() {
+ return mapWriter().done();
+ }
+
+ /**
+ * Create a boolean with a certain value
+ *
+ * @return a boolean
+ */
+ public IBool bool(boolean value);
+
+ /**
+ * Create a new DateTime representing a date with the given date fields
+ *
+ * @param year
+ * the year of the date
+ * @param month
+ * the month of the date
+ * @param day
+ * the day of the date
+ *
+ * @return a DateTime date with the provided year, month, and day
+ */
+ public IDateTime date(int year, int month, int day);
+
+ /**
+ * Create a new DateTime representing a time with the given time fields
+ *
+ * @param hour
+ * the hour of the time
+ * @param minute
+ * the minute of the time
+ * @param second
+ * the second of the time
+ * @param millisecond
+ * the millisecond of the time
+ *
+ * @return a DateTime time with the provided hour, minute, second, and
+ * milliseconds
+ */
+ public IDateTime time(int hour, int minute, int second, int millisecond);
+
+ /**
+ * Create a new DateTime representing a time with the given time fields
+ *
+ * @param hour
+ * the hour of the time
+ * @param minute
+ * the minute of the time
+ * @param second
+ * the second of the time
+ * @param millisecond
+ * the millisecond of the time
+ * @param hourOffset
+ * the hour offset of the timezone for this time (can be
+ * negative)
+ * @param minuteOffset
+ * the minute offset of the timezone for this time (can be
+ * negative if the hourOffset is 0)
+ *
+ * @return a DateTime time with the provided hour, minute, second,
+ * milliseconds, and timezone offset
+ */
+ public IDateTime time(int hour, int minute, int second, int millisecond,
+ int hourOffset, int minuteOffset);
+
+ /**
+ * Create a new DateTime with the given date and time fields
+ *
+ * @param year
+ * the year of the date
+ * @param month
+ * the month of the date
+ * @param day
+ * the day of the date
+ * @param hour
+ * the hour of the time
+ * @param minute
+ * the minute of the time
+ * @param second
+ * the second of the time
+ * @param millisecond
+ * the millisecond of the time
+ *
+ * @return a DateTime with the values for year, month, etc provided in the
+ * parameters
+ */
+ public IDateTime datetime(int year, int month, int day, int hour,
+ int minute, int second, int millisecond);
+
+ /**
+ * Create a new DateTime with the given date and time fields
+ *
+ * @param year
+ * the year of the date
+ * @param month
+ * the month of the date
+ * @param day
+ * the day of the date
+ * @param hour
+ * the hour of the time
+ * @param minute
+ * the minute of the time
+ * @param second
+ * the second of the time
+ * @param millisecond
+ * the millisecond of the time
+ * @param hourOffset
+ * the hour offset of the timezone for this time (can be
+ * negative)
+ * @param minuteOffset
+ * the minute offset of the timezone for this time (can be
+ * negative if the hourOffset is 0)
+ *
+ * @return a DateTime with the values for year, month, etc provided in the
+ * parameters
+ */
+ public IDateTime datetime(int year, int month, int day, int hour,
+ int minute, int second, int millisecond, int hourOffset,
+ int minuteOffset);
+
+ /**
+ * Create a new DateTime representing the given instant.
+ *
+ * @param instant
+ * the instant in time, according to the Java epoch
+ *
+ * @return a DateTime set to the given instant in time
+ */
+ public IDateTime datetime(long instant);
+
+ /**
+ * Create a new DateTime representing the given instant.
+ *
+ * @param instant
+ * the instant in time, according to the Java epoch
+ * @param timezoneHours The hour offset for the new object's timezone
+ * @param timezoneMinutes The minute offset for the new object's timezone
+ *
+ * @return a DateTime set to the given instant in time
+ */
+ public IDateTime datetime(long instant, int timezoneHours, int timezoneMinutes);
}
diff --git a/src/main/java/io/usethesource/vallang/IWithKeywordParameters.java b/src/main/java/io/usethesource/vallang/IWithKeywordParameters.java
index 1dc772c5c..61ef669a4 100644
--- a/src/main/java/io/usethesource/vallang/IWithKeywordParameters.java
+++ b/src/main/java/io/usethesource/vallang/IWithKeywordParameters.java
@@ -8,7 +8,7 @@
* Contributors:
*
* * Jurgen J. Vinju - Jurgen.Vinju@cwi.nl - CWI
- * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
+ * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
*******************************************************************************/
package io.usethesource.vallang;
@@ -19,76 +19,76 @@
public interface IWithKeywordParameters {
- /**
- * Get the value of a parmeter
- *
- * @param label identifies the parameter
- * @return a value if the parameter has a value on this node or null otherwise
- */
- public @Nullable IValue getParameter(String label);
-
- /**
- * Set the value of an parameter
- *
- * @param label identifies the parameter
- * @param newValue the new value for the parameter
- * @return a new node where the value of the parameter is replaced (if previously present) or newly added
- * @throws FactTypeUseException when the type of the new value is not comparable to the old parameter value
- */
- public T setParameter(String label, IValue newValue);
+ /**
+ * Get the value of a parmeter
+ *
+ * @param label identifies the parameter
+ * @return a value if the parameter has a value on this node or null otherwise
+ */
+ public @Nullable IValue getParameter(String label);
- /**
- * Unset the value of an parameter
- *
- * @param label identifies the parameter
- * @return a new node where the value of the parameter is not present anymore
- */
- public T unsetParameter(String label);
+ /**
+ * Set the value of an parameter
+ *
+ * @param label identifies the parameter
+ * @param newValue the new value for the parameter
+ * @return a new node where the value of the parameter is replaced (if previously present) or newly added
+ * @throws FactTypeUseException when the type of the new value is not comparable to the old parameter value
+ */
+ public T setParameter(String label, IValue newValue);
- /**
- * Unset the values of all parameters
- *
- * @param label identifies the parameter
- * @return a new node where the value of all keyword parameters are unset
- */
- public T unsetAll();
-
- /**
- * Check whether a certain parameter is set.
- *
- * @param label identifies the parameter
- * @return true iff the parameter has a value on this node
- * @throws FactTypeUseException when no parameter with this label is defined for this type of node.
- */
- public boolean hasParameter(String label);
+ /**
+ * Unset the value of an parameter
+ *
+ * @param label identifies the parameter
+ * @return a new node where the value of the parameter is not present anymore
+ */
+ public T unsetParameter(String label);
- /**
- * Check whether any parameters are present.
- */
- public boolean hasParameters();
-
- /**
- * @return a set of parameter names
- */
- public Set getParameterNames();
+ /**
+ * Unset the values of all parameters
+ *
+ * @param label identifies the parameter
+ * @return a new node where the value of all keyword parameters are unset
+ */
+ public T unsetAll();
- /**
- * @return an unmodifiable map for the keyword parameters
- */
- Map getParameters();
+ /**
+ * Check whether a certain parameter is set.
+ *
+ * @param label identifies the parameter
+ * @return true iff the parameter has a value on this node
+ * @throws FactTypeUseException when no parameter with this label is defined for this type of node.
+ */
+ public boolean hasParameter(String label);
- /**
- *
- * @param params
- * @return
- */
- T setParameters(Map params);
+ /**
+ * Check whether any parameters are present.
+ */
+ public boolean hasParameters();
- /**
- * Given an arbitrary other IWithKeywordParameters, compare the values of the
- * parameters.
- * @param other
- * @return true iff the parameters are the same (same labels, same values)
- */
- > boolean equalParameters(U other);
+ /**
+ * @return a set of parameter names
+ */
+ public Set getParameterNames();
+
+ /**
+ * @return an unmodifiable map for the keyword parameters
+ */
+ Map getParameters();
+
+ /**
+ *
+ * @param params
+ * @return
+ */
+ T setParameters(Map params);
+
+ /**
+ * Given an arbitrary other IWithKeywordParameters, compare the values of the
+ * parameters.
+ * @param other
+ * @return true iff the parameters are the same (same labels, same values)
+ */
+ > boolean equalParameters(U other);
}
diff --git a/src/main/java/io/usethesource/vallang/IWriter.java b/src/main/java/io/usethesource/vallang/IWriter.java
index 40bfd7f06..f23cbe024 100644
--- a/src/main/java/io/usethesource/vallang/IWriter.java
+++ b/src/main/java/io/usethesource/vallang/IWriter.java
@@ -15,7 +15,7 @@ public interface IWriter> extends Iterable, Col
* Modify this writer to insert only unique instances into the collection
* @return
*/
- public default IWriter unique() {
+ public default IWriter unique() {
return this;
}
@@ -35,7 +35,7 @@ public default void append(IValue... value) {
/**
* Append elements at the end.
- *
+ *
* @param value array of elements to append
* @throws FactTypeUseException when done() was called before
*/
diff --git a/src/main/java/io/usethesource/vallang/exceptions/EmptyIdentifierException.java b/src/main/java/io/usethesource/vallang/exceptions/EmptyIdentifierException.java
index 30caac4be..8db3ee61e 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/EmptyIdentifierException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/EmptyIdentifierException.java
@@ -1,9 +1,9 @@
package io.usethesource.vallang.exceptions;
public class EmptyIdentifierException extends FactTypeDeclarationException {
- private static final long serialVersionUID = -7032740671919237233L;
+ private static final long serialVersionUID = -7032740671919237233L;
- public EmptyIdentifierException() {
- super("An identifier can not be empty or null");
- }
+ public EmptyIdentifierException() {
+ super("An identifier can not be empty or null");
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/FactParseError.java b/src/main/java/io/usethesource/vallang/exceptions/FactParseError.java
index a7954cd1f..8de5817fd 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/FactParseError.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/FactParseError.java
@@ -1,32 +1,32 @@
package io.usethesource.vallang.exceptions;
public class FactParseError extends RuntimeException {
- private static final long serialVersionUID = 8208492896666238438L;
- private int offset = -1;
+ private static final long serialVersionUID = 8208492896666238438L;
+ private int offset = -1;
- public FactParseError(String message, Throwable cause) {
- super(message, cause);
- }
-
- public FactParseError(String message, int offset) {
- super(message);
- this.offset = offset;
- }
-
- public FactParseError(String message, int offset, Throwable cause) {
- super(message + " at offset " + offset, cause);
- this.offset = offset;
- }
+ public FactParseError(String message, Throwable cause) {
+ super(message, cause);
+ }
- public boolean hasCause() {
- return getCause() != null;
- }
-
-
- public boolean hasOffset() {
- return offset != -1;
- }
- public int getOffset() {
- return offset;
- }
+ public FactParseError(String message, int offset) {
+ super(message);
+ this.offset = offset;
+ }
+
+ public FactParseError(String message, int offset, Throwable cause) {
+ super(message + " at offset " + offset, cause);
+ this.offset = offset;
+ }
+
+ public boolean hasCause() {
+ return getCause() != null;
+ }
+
+
+ public boolean hasOffset() {
+ return offset != -1;
+ }
+ public int getOffset() {
+ return offset;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/FactTypeDeclarationException.java b/src/main/java/io/usethesource/vallang/exceptions/FactTypeDeclarationException.java
index 168be8e59..b52dc6b35 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/FactTypeDeclarationException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/FactTypeDeclarationException.java
@@ -13,13 +13,13 @@
package io.usethesource.vallang.exceptions;
public abstract class FactTypeDeclarationException extends RuntimeException {
- private static final long serialVersionUID = -2991169068626385361L;
+ private static final long serialVersionUID = -2991169068626385361L;
- public FactTypeDeclarationException(String message) {
- super(message);
- }
-
- public FactTypeDeclarationException(String message, Throwable cause) {
- super(message, cause);
- }
+ public FactTypeDeclarationException(String message) {
+ super(message);
+ }
+
+ public FactTypeDeclarationException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/FactTypeRedeclaredException.java b/src/main/java/io/usethesource/vallang/exceptions/FactTypeRedeclaredException.java
index a9dc9bb18..31ca212cf 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/FactTypeRedeclaredException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/FactTypeRedeclaredException.java
@@ -3,23 +3,23 @@
import io.usethesource.vallang.type.Type;
public class FactTypeRedeclaredException extends FactTypeDeclarationException {
- private static final long serialVersionUID = 9191150588452685289L;
- private String name;
- private Type earlier;
-
- public FactTypeRedeclaredException(String name, Type earlier) {
- super(name + " was declared earlier as " + earlier);
- this.name = name;
- this.earlier = earlier;
- }
+ private static final long serialVersionUID = 9191150588452685289L;
+ private String name;
+ private Type earlier;
+
+ public FactTypeRedeclaredException(String name, Type earlier) {
+ super(name + " was declared earlier as " + earlier);
+ this.name = name;
+ this.earlier = earlier;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public Type declaredEarlier() {
+ return earlier;
+ }
+
- public String getName() {
- return name;
- }
-
- public Type declaredEarlier() {
- return earlier;
- }
-
-
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/FactTypeUseException.java b/src/main/java/io/usethesource/vallang/exceptions/FactTypeUseException.java
index f49ef8342..3e13e732f 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/FactTypeUseException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/FactTypeUseException.java
@@ -16,10 +16,10 @@ public abstract class FactTypeUseException extends RuntimeException {
private static final long serialVersionUID= 2135696551442574010L;
public FactTypeUseException(String message) {
- super(message);
+ super(message);
}
-
+
public FactTypeUseException(String reason, Throwable cause) {
- super(reason, cause);
+ super(reason, cause);
}
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/FieldLabelMismatchException.java b/src/main/java/io/usethesource/vallang/exceptions/FieldLabelMismatchException.java
index 448f6d7bc..e42559780 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/FieldLabelMismatchException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/FieldLabelMismatchException.java
@@ -1,22 +1,22 @@
package io.usethesource.vallang.exceptions;
public class FieldLabelMismatchException extends FactTypeDeclarationException {
- private static final long serialVersionUID = 3510697170437859049L;
- private int fields;
- private int labels;
+ private static final long serialVersionUID = 3510697170437859049L;
+ private int fields;
+ private int labels;
- public FieldLabelMismatchException(int fields, int labels) {
- super("Expected " + fields + " field labels, but got " + labels);
- this.fields = fields;
- this.labels = labels;
- }
-
- public int getFields() {
- return fields;
- }
-
- public int getLabels() {
- return labels;
- }
+ public FieldLabelMismatchException(int fields, int labels) {
+ super("Expected " + fields + " field labels, but got " + labels);
+ this.fields = fields;
+ this.labels = labels;
+ }
+
+ public int getFields() {
+ return fields;
+ }
+
+ public int getLabels() {
+ return labels;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalConstructorApplicationException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalConstructorApplicationException.java
index 2375b3745..865ab5522 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalConstructorApplicationException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalConstructorApplicationException.java
@@ -3,11 +3,11 @@
import io.usethesource.vallang.type.Type;
public class IllegalConstructorApplicationException extends FactTypeUseException {
- private static final long serialVersionUID = -1412303012184333060L;
+ private static final long serialVersionUID = -1412303012184333060L;
+
+ public IllegalConstructorApplicationException(Type constructorType, Type arguments) {
+ super("Constructor " + constructorType + " is not applicable to " + arguments);
+ }
- public IllegalConstructorApplicationException(Type constructorType, Type arguments) {
- super("Constructor " + constructorType + " is not applicable to " + arguments);
- }
-
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldNameException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldNameException.java
index 0d41996cd..26b0572e9 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldNameException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldNameException.java
@@ -3,25 +3,25 @@
import org.checkerframework.checker.nullness.qual.Nullable;
public class IllegalFieldNameException extends FactTypeDeclarationException {
- private static final long serialVersionUID = -2480224409679761754L;
- private int pos;
- private Object elem;
+ private static final long serialVersionUID = -2480224409679761754L;
+ private int pos;
+ private Object elem;
- public IllegalFieldNameException(int pos, Object elem, ClassCastException cause) {
- super("Expected a field name at position " + pos + ", but got something different", cause);
- this.pos = pos;
- this.elem = elem;
- }
-
- public Object getElement() {
- return elem;
- }
-
- public int getPos() {
- return pos;
- }
-
- public synchronized @Nullable ClassCastException getCause() {
- return (ClassCastException) super.getCause();
- }
+ public IllegalFieldNameException(int pos, Object elem, ClassCastException cause) {
+ super("Expected a field name at position " + pos + ", but got something different", cause);
+ this.pos = pos;
+ this.elem = elem;
+ }
+
+ public Object getElement() {
+ return elem;
+ }
+
+ public int getPos() {
+ return pos;
+ }
+
+ public synchronized @Nullable ClassCastException getCause() {
+ return (ClassCastException) super.getCause();
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldTypeException.java
index 4f4e3f68e..b3e9ff6bb 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalFieldTypeException.java
@@ -1,26 +1,26 @@
package io.usethesource.vallang.exceptions;
public class IllegalFieldTypeException extends FactTypeDeclarationException {
- private static final long serialVersionUID = -8845629423612702596L;
- private int pos;
- private Object elem;
+ private static final long serialVersionUID = -8845629423612702596L;
+ private int pos;
+ private Object elem;
- public IllegalFieldTypeException(int pos, Object elem, ClassCastException cause) {
- super("Expected a field type at position " + pos + ", but got something different", cause);
- this.pos = pos;
- this.elem = elem;
- }
+ public IllegalFieldTypeException(int pos, Object elem, ClassCastException cause) {
+ super("Expected a field type at position " + pos + ", but got something different", cause);
+ this.pos = pos;
+ this.elem = elem;
+ }
- public Object getElement() {
- return elem;
- }
-
- public int getPos() {
- return pos;
- }
-
- public synchronized Throwable getCause() {
- Throwable cause = super.getCause();
- return cause == null ? this : cause;
- }
+ public Object getElement() {
+ return elem;
+ }
+
+ public int getPos() {
+ return pos;
+ }
+
+ public synchronized Throwable getCause() {
+ Throwable cause = super.getCause();
+ return cause == null ? this : cause;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalIdentifierException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalIdentifierException.java
index a11569832..7759b9d3f 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalIdentifierException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalIdentifierException.java
@@ -1,15 +1,15 @@
package io.usethesource.vallang.exceptions;
public class IllegalIdentifierException extends FactTypeDeclarationException {
- private static final long serialVersionUID = 7380196205269771711L;
- private String id;
+ private static final long serialVersionUID = 7380196205269771711L;
+ private String id;
- public IllegalIdentifierException(String id) {
- super(id + " is not a valid identifier");
- this.id = id;
- }
-
- public String getIdentifier() {
- return id;
- }
+ public IllegalIdentifierException(String id) {
+ super(id + " is not a valid identifier");
+ this.id = id;
+ }
+
+ public String getIdentifier() {
+ return id;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalInstantiatedAbstractDataTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalInstantiatedAbstractDataTypeException.java
index ae4a46623..752eb601a 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalInstantiatedAbstractDataTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalInstantiatedAbstractDataTypeException.java
@@ -3,10 +3,10 @@
import io.usethesource.vallang.type.Type;
public class IllegalInstantiatedAbstractDataTypeException extends
- FactTypeDeclarationException {
- private static final long serialVersionUID = -7171289358305194254L;
+ FactTypeDeclarationException {
+ private static final long serialVersionUID = -7171289358305194254L;
- public IllegalInstantiatedAbstractDataTypeException(Type adt) {
- super("should not declare instances of type-parametrized abstract data-types (" + adt + ")");
- }
+ public IllegalInstantiatedAbstractDataTypeException(Type adt) {
+ super("should not declare instances of type-parametrized abstract data-types (" + adt + ")");
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalKeywordParameterDeclarationException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalKeywordParameterDeclarationException.java
index cbcae7239..cfc25c49b 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalKeywordParameterDeclarationException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalKeywordParameterDeclarationException.java
@@ -3,9 +3,9 @@
import io.usethesource.vallang.type.Type;
public class IllegalKeywordParameterDeclarationException extends FactTypeUseException {
- private static final long serialVersionUID = -1073149631907760703L;
-
- public IllegalKeywordParameterDeclarationException(Type type) {
- super("Keyword parameters can not be declared on " + type);
- }
+ private static final long serialVersionUID = -1073149631907760703L;
+
+ public IllegalKeywordParameterDeclarationException(Type type) {
+ super("Keyword parameters can not be declared on " + type);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/IllegalOperationException.java b/src/main/java/io/usethesource/vallang/exceptions/IllegalOperationException.java
index d9336067f..dd55f50cd 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/IllegalOperationException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/IllegalOperationException.java
@@ -3,13 +3,13 @@
import io.usethesource.vallang.type.Type;
public class IllegalOperationException extends FactTypeUseException {
- private static final long serialVersionUID = 546504861606007094L;
-
- public IllegalOperationException(String op, Type lhs) {
- super("Operation " + op + " not allowed on " + lhs);
- }
-
- public IllegalOperationException(String op, Type lhs, Type rhs) {
- super("Operation " +op + " not allowed on " + lhs + " and " + rhs);
- }
+ private static final long serialVersionUID = 546504861606007094L;
+
+ public IllegalOperationException(String op, Type lhs) {
+ super("Operation " + op + " not allowed on " + lhs);
+ }
+
+ public IllegalOperationException(String op, Type lhs, Type rhs) {
+ super("Operation " +op + " not allowed on " + lhs + " and " + rhs);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/InvalidDateTimeException.java b/src/main/java/io/usethesource/vallang/exceptions/InvalidDateTimeException.java
index 629948535..cd0bf57e0 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/InvalidDateTimeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/InvalidDateTimeException.java
@@ -1,15 +1,15 @@
-package io.usethesource.vallang.exceptions;
-
-public class InvalidDateTimeException extends FactTypeUseException {
-
- private static final long serialVersionUID = 5634976179346912971L;
-
- public InvalidDateTimeException(String message) {
- super(message);
- }
-
- public InvalidDateTimeException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
+package io.usethesource.vallang.exceptions;
+
+public class InvalidDateTimeException extends FactTypeUseException {
+
+ private static final long serialVersionUID = 5634976179346912971L;
+
+ public InvalidDateTimeException(String message) {
+ super(message);
+ }
+
+ public InvalidDateTimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/NullTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/NullTypeException.java
index 11195884b..bf8962d04 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/NullTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/NullTypeException.java
@@ -1,10 +1,10 @@
package io.usethesource.vallang.exceptions;
public class NullTypeException extends FactTypeUseException {
- private static final long serialVersionUID = -4201840676263159311L;
+ private static final long serialVersionUID = -4201840676263159311L;
- public NullTypeException() {
- super("A null reference as a type");
- }
+ public NullTypeException() {
+ super("A null reference as a type");
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/OverloadingNotSupportedException.java b/src/main/java/io/usethesource/vallang/exceptions/OverloadingNotSupportedException.java
index ecd4f4a5c..0b08e5d10 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/OverloadingNotSupportedException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/OverloadingNotSupportedException.java
@@ -3,14 +3,14 @@
import io.usethesource.vallang.type.Type;
public class OverloadingNotSupportedException extends FactTypeUseException {
- private static final long serialVersionUID = 5645367130014687132L;
+ private static final long serialVersionUID = 5645367130014687132L;
- public OverloadingNotSupportedException(String constructorId) {
- super("Overloading is not supported (" + constructorId + ")");
- }
-
- public OverloadingNotSupportedException(Type adt, String constructorId) {
- super("Overloading is not supported (" + adt + "." + constructorId + ")");
- }
+ public OverloadingNotSupportedException(String constructorId) {
+ super("Overloading is not supported (" + constructorId + ")");
+ }
+
+ public OverloadingNotSupportedException(Type adt, String constructorId) {
+ super("Overloading is not supported (" + adt + "." + constructorId + ")");
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredConstructorException.java b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredConstructorException.java
index 3e2c2eef6..fb48e4db7 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredConstructorException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredConstructorException.java
@@ -3,28 +3,28 @@
import io.usethesource.vallang.type.Type;
public class RedeclaredConstructorException extends
- FactTypeDeclarationException {
- private static final long serialVersionUID = 8330548728032865311L;
- private String name;
- private Type firstArgs;
- private Type secondArgs;
+ FactTypeDeclarationException {
+ private static final long serialVersionUID = 8330548728032865311L;
+ private String name;
+ private Type firstArgs;
+ private Type secondArgs;
- public RedeclaredConstructorException(String name, Type firstArgs, Type secondArgs) {
- super("Constructor " + name + " overloaded with comparable argument types: " + firstArgs + " and " + secondArgs);
- this.name = name;
- this.firstArgs = firstArgs;
- this.secondArgs = secondArgs;
- }
+ public RedeclaredConstructorException(String name, Type firstArgs, Type secondArgs) {
+ super("Constructor " + name + " overloaded with comparable argument types: " + firstArgs + " and " + secondArgs);
+ this.name = name;
+ this.firstArgs = firstArgs;
+ this.secondArgs = secondArgs;
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public Type getFirstArgs() {
- return firstArgs;
- }
+ public Type getFirstArgs() {
+ return firstArgs;
+ }
- public Type getSecondArgs() {
- return secondArgs;
- }
+ public Type getSecondArgs() {
+ return secondArgs;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredFieldNameException.java b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredFieldNameException.java
index d15984557..2016e231c 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredFieldNameException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredFieldNameException.java
@@ -3,35 +3,35 @@
import io.usethesource.vallang.type.Type;
public class RedeclaredFieldNameException extends
- FactTypeDeclarationException {
- private static final long serialVersionUID = -4401062690006714904L;
- private String label;
- private Type one;
- private Type two;
- private Type tupleType;
-
- public RedeclaredFieldNameException(String label, Type one, Type two, Type tupleType) {
- super("The field name " + label + " is illegally used for both " + one + " and " + two + " in type " + tupleType);
- this.label = label;
- this.one = one;
- this.two = two;
- this.tupleType = tupleType;
- }
-
- public String getFieldName() {
- return label;
- }
-
- public Type getFirstType() {
- return one;
- }
-
- public Type getSecondType() {
- return two;
- }
-
- public Type getTupleType() {
- return tupleType;
- }
+ FactTypeDeclarationException {
+ private static final long serialVersionUID = -4401062690006714904L;
+ private String label;
+ private Type one;
+ private Type two;
+ private Type tupleType;
+
+ public RedeclaredFieldNameException(String label, Type one, Type two, Type tupleType) {
+ super("The field name " + label + " is illegally used for both " + one + " and " + two + " in type " + tupleType);
+ this.label = label;
+ this.one = one;
+ this.two = two;
+ this.tupleType = tupleType;
+ }
+
+ public String getFieldName() {
+ return label;
+ }
+
+ public Type getFirstType() {
+ return one;
+ }
+
+ public Type getSecondType() {
+ return two;
+ }
+
+ public Type getTupleType() {
+ return tupleType;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredKeywordParameterException.java b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredKeywordParameterException.java
index 594a22c9c..08221c984 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/RedeclaredKeywordParameterException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/RedeclaredKeywordParameterException.java
@@ -3,21 +3,21 @@
import io.usethesource.vallang.type.Type;
public class RedeclaredKeywordParameterException extends FactTypeDeclarationException {
- private static final long serialVersionUID = -2118606173620347920L;
- private String label;
- private Type earlier;
+ private static final long serialVersionUID = -2118606173620347920L;
+ private String label;
+ private Type earlier;
- public RedeclaredKeywordParameterException(String label, Type earlier) {
- super("Keyword parameter " + label + " was declared earlier as " + earlier);
- this.label = label;
- this.earlier = earlier;
- }
-
- public String getLabel() {
- return label;
- }
-
- public Type getEarlierType() {
- return earlier;
- }
+ public RedeclaredKeywordParameterException(String label, Type earlier) {
+ super("Keyword parameter " + label + " was declared earlier as " + earlier);
+ this.label = label;
+ this.earlier = earlier;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public Type getEarlierType() {
+ return earlier;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/TypeParseError.java b/src/main/java/io/usethesource/vallang/exceptions/TypeParseError.java
index 1e2443198..672f978ee 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/TypeParseError.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/TypeParseError.java
@@ -4,29 +4,29 @@ public class TypeParseError extends RuntimeException {
private static final long serialVersionUID = 7054359699049181437L;
private int offset = -1;
- public TypeParseError(String message, Throwable cause) {
- super(message, cause);
- }
-
- public TypeParseError(String message, int offset) {
- super(message);
- this.offset = offset;
- }
-
- public TypeParseError(String message, int offset, Throwable cause) {
- super(message + " at offset " + offset, cause);
- this.offset = offset;
- }
+ public TypeParseError(String message, Throwable cause) {
+ super(message, cause);
+ }
- public boolean hasCause() {
- return getCause() != null;
- }
-
-
- public boolean hasOffset() {
- return offset != -1;
- }
- public int getOffset() {
- return offset;
- }
+ public TypeParseError(String message, int offset) {
+ super(message);
+ this.offset = offset;
+ }
+
+ public TypeParseError(String message, int offset, Throwable cause) {
+ super(message + " at offset " + offset, cause);
+ this.offset = offset;
+ }
+
+ public boolean hasCause() {
+ return getCause() != null;
+ }
+
+
+ public boolean hasOffset() {
+ return offset != -1;
+ }
+ public int getOffset() {
+ return offset;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/TypeReificationException.java b/src/main/java/io/usethesource/vallang/exceptions/TypeReificationException.java
index 6980efe1a..621201f12 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/TypeReificationException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/TypeReificationException.java
@@ -1,9 +1,9 @@
package io.usethesource.vallang.exceptions;
public class TypeReificationException extends FactTypeUseException {
- private static final long serialVersionUID = -1606508959996710935L;
+ private static final long serialVersionUID = -1606508959996710935L;
- public TypeReificationException(String reason, Throwable cause) {
- super(reason, cause);
- }
+ public TypeReificationException(String reason, Throwable cause) {
+ super(reason, cause);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UndeclaredAbstractDataTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UndeclaredAbstractDataTypeException.java
index 97a61489e..66e66ef5f 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UndeclaredAbstractDataTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UndeclaredAbstractDataTypeException.java
@@ -3,10 +3,10 @@
import io.usethesource.vallang.type.Type;
public class UndeclaredAbstractDataTypeException extends
- FactTypeDeclarationException {
- private static final long serialVersionUID = 2192451595458909479L;
+ FactTypeDeclarationException {
+ private static final long serialVersionUID = 2192451595458909479L;
- public UndeclaredAbstractDataTypeException(Type adt) {
- super(adt + " is not registered");
- }
+ public UndeclaredAbstractDataTypeException(Type adt) {
+ super(adt + " is not registered");
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UndeclaredFieldException.java b/src/main/java/io/usethesource/vallang/exceptions/UndeclaredFieldException.java
index 845faaa58..5e9f1daf5 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UndeclaredFieldException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UndeclaredFieldException.java
@@ -3,21 +3,21 @@
import io.usethesource.vallang.type.Type;
public class UndeclaredFieldException extends FactTypeUseException {
- private static final long serialVersionUID = 8997399464492627705L;
- private Type type;
- private String label;
-
- public UndeclaredFieldException(Type type, String label) {
- super(type + " does not have a field with label " + label + " declared for it");
- this.type = type;
- this.label = label;
- }
-
- public Type getType() {
- return type;
- }
-
- public String getLabel() {
- return label;
- }
+ private static final long serialVersionUID = 8997399464492627705L;
+ private Type type;
+ private String label;
+
+ public UndeclaredFieldException(Type type, String label) {
+ super(type + " does not have a field with label " + label + " declared for it");
+ this.type = type;
+ this.label = label;
+ }
+
+ public Type getType() {
+ return type;
+ }
+
+ public String getLabel() {
+ return label;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedAnnotationTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedAnnotationTypeException.java
index 1f46856ed..b014cf585 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedAnnotationTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedAnnotationTypeException.java
@@ -3,10 +3,10 @@
import io.usethesource.vallang.type.Type;
public class UnexpectedAnnotationTypeException extends UnexpectedTypeException {
- private static final long serialVersionUID = -4865168232421987847L;
+ private static final long serialVersionUID = -4865168232421987847L;
- public UnexpectedAnnotationTypeException(Type expected, Type got) {
- super(expected, got);
- }
+ public UnexpectedAnnotationTypeException(Type expected, Type got) {
+ super(expected, got);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedChildTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedChildTypeException.java
index c6dc11793..0739fce13 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedChildTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedChildTypeException.java
@@ -3,9 +3,9 @@
import io.usethesource.vallang.type.Type;
public class UnexpectedChildTypeException extends UnexpectedTypeException {
- private static final long serialVersionUID = -1848764011952028440L;
+ private static final long serialVersionUID = -1848764011952028440L;
- public UnexpectedChildTypeException(Type expected, Type got) {
- super(expected, got);
- }
+ public UnexpectedChildTypeException(Type expected, Type got) {
+ super(expected, got);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedConstructorTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedConstructorTypeException.java
index 6ec4c9e79..e2d592dd4 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedConstructorTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedConstructorTypeException.java
@@ -3,10 +3,10 @@
import io.usethesource.vallang.type.Type;
public class UnexpectedConstructorTypeException extends UnexpectedTypeException {
- private static final long serialVersionUID = -6198133177142765746L;
+ private static final long serialVersionUID = -6198133177142765746L;
- public UnexpectedConstructorTypeException(Type expected, Type got) {
- super(expected, got);
- }
+ public UnexpectedConstructorTypeException(Type expected, Type got) {
+ super(expected, got);
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedTypeException.java
index d4c2405b1..54f2f820f 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UnexpectedTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UnexpectedTypeException.java
@@ -3,27 +3,27 @@
import io.usethesource.vallang.type.Type;
public class UnexpectedTypeException extends FactTypeUseException {
- private static final long serialVersionUID = -5107803679675463540L;
- private Type expected;
- private Type got;
-
- public UnexpectedTypeException(Type expected, Type got) {
- super("Expected " + expected + ", but got " + got);
- this.expected = expected;
- this.got = got;
- }
-
- public boolean hasExpected() {
- return expected != null;
- }
-
- public Type getExpected() {
- return expected;
- }
-
- public Type getGiven() {
- return got;
- }
+ private static final long serialVersionUID = -5107803679675463540L;
+ private Type expected;
+ private Type got;
+
+ public UnexpectedTypeException(Type expected, Type got) {
+ super("Expected " + expected + ", but got " + got);
+ this.expected = expected;
+ this.got = got;
+ }
+
+ public boolean hasExpected() {
+ return expected != null;
+ }
+
+ public Type getExpected() {
+ return expected;
+ }
+
+ public Type getGiven() {
+ return got;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/exceptions/UnsupportedTypeException.java b/src/main/java/io/usethesource/vallang/exceptions/UnsupportedTypeException.java
index 90b88cb9a..fc833493d 100644
--- a/src/main/java/io/usethesource/vallang/exceptions/UnsupportedTypeException.java
+++ b/src/main/java/io/usethesource/vallang/exceptions/UnsupportedTypeException.java
@@ -3,14 +3,14 @@
import io.usethesource.vallang.type.Type;
public class UnsupportedTypeException extends FactTypeUseException {
- private static final long serialVersionUID = -8995093767494157052L;
- private Type type;
- public UnsupportedTypeException(String explanation, Type type) {
- super(explanation);
- this.type = type;
- }
-
- public Type getType() {
- return type;
- }
+ private static final long serialVersionUID = -8995093767494157052L;
+ private Type type;
+ public UnsupportedTypeException(String explanation, Type type) {
+ super(explanation);
+ this.type = type;
+ }
+
+ public Type getType() {
+ return type;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/impl/fields/AbstractDefaultWithKeywordParameters.java b/src/main/java/io/usethesource/vallang/impl/fields/AbstractDefaultWithKeywordParameters.java
index 210f0c308..2a4fff2c4 100644
--- a/src/main/java/io/usethesource/vallang/impl/fields/AbstractDefaultWithKeywordParameters.java
+++ b/src/main/java/io/usethesource/vallang/impl/fields/AbstractDefaultWithKeywordParameters.java
@@ -7,7 +7,7 @@
*
* Contributors:
*
- * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
+ * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
*******************************************************************************/
package io.usethesource.vallang.impl.fields;
@@ -24,166 +24,166 @@
/**
- * A generic wrapper for an {@link IValue} that associates keyword parameters to it.
+ * A generic wrapper for an {@link IValue} that associates keyword parameters to it.
*
* @param the interface over which this parameter wrapper closes
*/
public abstract class AbstractDefaultWithKeywordParameters implements IWithKeywordParameters {
- protected final T content;
- protected final io.usethesource.capsule.Map.Immutable parameters;
-
- /**
- * Creates an {@link IWithKeywordParameters} view on {@link #content} with already
- * provided {@link #parameters}.
- *
- * @param content
- * is the wrapped object that supports keywod fields
- * @param parameters
- * is the map of fields associated to {@link #content}
- */
- public AbstractDefaultWithKeywordParameters(T content, io.usethesource.capsule.Map.Immutable parameters) {
- this.content = content;
- this.parameters = parameters;
- }
-
- /**
- * Wraps {@link #content} with other parameters. This methods is mandatory
- * because of PDB's immutable value nature: Once parameters are modified, a
- * new immutable view is returned.
- *
- * @param content
- * is the wrapped object that supports keyword fields
- * @param annotations
- * is the map of fields associated to {@link #content}
- * @return a new representations of {@link #content} with associated
- * {@link #parameters}
- */
- protected abstract T wrap(final T content, final io.usethesource.capsule.Map.Immutable parameters);
-
- @Override
- public String toString() {
- return content.toString();
- }
-
- @Override
- public @Nullable IValue getParameter(String label) {
- return parameters.get(label);
- }
-
- @Override
- public T setParameter(String label, IValue newValue) {
- return wrap(content, parameters.__put(label, newValue));
- }
-
- @Override
- public T unsetParameter(String label) {
- io.usethesource.capsule.Map.Immutable removed = parameters.__remove(label);
-
- if (removed.isEmpty()) {
- return content;
- }
- return wrap(content, removed);
- }
-
- @Override
- public T unsetAll() {
- return content;
- }
-
- @Override
- @Pure
- public boolean hasParameter(String label) {
- return parameters.containsKey(label);
- }
-
- @Override
- public boolean hasParameters() {
- return !parameters.isEmpty();
- }
-
- @Override
- @Pure
- public Set getParameterNames() {
- return Collections.unmodifiableSet(parameters.keySet());
- }
-
- @Override
- public Map getParameters() {
- return Collections.unmodifiableMap(parameters);
- }
-
- @Override
- public int hashCode() {
- return 91 + content.hashCode() * 13 + 101 * parameters.hashCode();
- }
-
- @Override
- public boolean equals(@Nullable Object other) {
- if (other == null) {
- return false;
- }
-
- if (!getClass().equals(other.getClass())) {
- return false;
- }
-
- AbstractDefaultWithKeywordParameters o = (AbstractDefaultWithKeywordParameters) other;
-
- if (!content.equals(o.content)) {
- return false;
- }
-
- if (parameters.size() != o.parameters.size()) {
- return false;
- }
-
- // TODO: there should be a faster way for this
- for (String key : parameters.keySet()) {
- if (!parameters.get(key).equals(o.getParameter(key))) {
- return false;
- }
- }
-
- return true;
- }
-
- @Override
- public > boolean equalParameters(U other) {
- if (!(other instanceof AbstractDefaultWithKeywordParameters)) {
- return false;
- }
-
- AbstractDefaultWithKeywordParameters o = (AbstractDefaultWithKeywordParameters) other;
-
- if (parameters.size() != o.parameters.size()) {
- return false;
- }
-
- for (String key : parameters.keySet()) {
- IValue parameter = getParameter(key);
- if (parameter == null && o.getParameter(key) != null) {
- return false;
- }
- else if (parameter != null && !parameter.equals(o.getParameter(key))) {
- return false;
- }
- }
-
- return true;
- }
-
- @Override
- public T setParameters(Map params) {
- if (params.isEmpty()) {
- return content;
- }
- return wrap(content, AbstractSpecialisedImmutableMap.mapOf(params));
- }
-
- /**
- * This method is only to be used by internal methods, such as testing and fast iterators
- */
- public io.usethesource.capsule.Map.Immutable internalGetParameters() {
- return parameters;
- }
+ protected final T content;
+ protected final io.usethesource.capsule.Map.Immutable parameters;
+
+ /**
+ * Creates an {@link IWithKeywordParameters} view on {@link #content} with already
+ * provided {@link #parameters}.
+ *
+ * @param content
+ * is the wrapped object that supports keywod fields
+ * @param parameters
+ * is the map of fields associated to {@link #content}
+ */
+ public AbstractDefaultWithKeywordParameters(T content, io.usethesource.capsule.Map.Immutable parameters) {
+ this.content = content;
+ this.parameters = parameters;
+ }
+
+ /**
+ * Wraps {@link #content} with other parameters. This methods is mandatory
+ * because of PDB's immutable value nature: Once parameters are modified, a
+ * new immutable view is returned.
+ *
+ * @param content
+ * is the wrapped object that supports keyword fields
+ * @param annotations
+ * is the map of fields associated to {@link #content}
+ * @return a new representations of {@link #content} with associated
+ * {@link #parameters}
+ */
+ protected abstract T wrap(final T content, final io.usethesource.capsule.Map.Immutable parameters);
+
+ @Override
+ public String toString() {
+ return content.toString();
+ }
+
+ @Override
+ public @Nullable IValue getParameter(String label) {
+ return parameters.get(label);
+ }
+
+ @Override
+ public T setParameter(String label, IValue newValue) {
+ return wrap(content, parameters.__put(label, newValue));
+ }
+
+ @Override
+ public T unsetParameter(String label) {
+ io.usethesource.capsule.Map.Immutable removed = parameters.__remove(label);
+
+ if (removed.isEmpty()) {
+ return content;
+ }
+ return wrap(content, removed);
+ }
+
+ @Override
+ public T unsetAll() {
+ return content;
+ }
+
+ @Override
+ @Pure
+ public boolean hasParameter(String label) {
+ return parameters.containsKey(label);
+ }
+
+ @Override
+ public boolean hasParameters() {
+ return !parameters.isEmpty();
+ }
+
+ @Override
+ @Pure
+ public Set getParameterNames() {
+ return Collections.unmodifiableSet(parameters.keySet());
+ }
+
+ @Override
+ public Map getParameters() {
+ return Collections.unmodifiableMap(parameters);
+ }
+
+ @Override
+ public int hashCode() {
+ return 91 + content.hashCode() * 13 + 101 * parameters.hashCode();
+ }
+
+ @Override
+ public boolean equals(@Nullable Object other) {
+ if (other == null) {
+ return false;
+ }
+
+ if (!getClass().equals(other.getClass())) {
+ return false;
+ }
+
+ AbstractDefaultWithKeywordParameters o = (AbstractDefaultWithKeywordParameters) other;
+
+ if (!content.equals(o.content)) {
+ return false;
+ }
+
+ if (parameters.size() != o.parameters.size()) {
+ return false;
+ }
+
+ // TODO: there should be a faster way for this
+ for (String key : parameters.keySet()) {
+ if (!parameters.get(key).equals(o.getParameter(key))) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public > boolean equalParameters(U other) {
+ if (!(other instanceof AbstractDefaultWithKeywordParameters)) {
+ return false;
+ }
+
+ AbstractDefaultWithKeywordParameters o = (AbstractDefaultWithKeywordParameters) other;
+
+ if (parameters.size() != o.parameters.size()) {
+ return false;
+ }
+
+ for (String key : parameters.keySet()) {
+ IValue parameter = getParameter(key);
+ if (parameter == null && o.getParameter(key) != null) {
+ return false;
+ }
+ else if (parameter != null && !parameter.equals(o.getParameter(key))) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public T setParameters(Map params) {
+ if (params.isEmpty()) {
+ return content;
+ }
+ return wrap(content, AbstractSpecialisedImmutableMap.mapOf(params));
+ }
+
+ /**
+ * This method is only to be used by internal methods, such as testing and fast iterators
+ */
+ public io.usethesource.capsule.Map.Immutable internalGetParameters() {
+ return parameters;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/impl/fields/AbstractValueFactoryAdapter.java b/src/main/java/io/usethesource/vallang/impl/fields/AbstractValueFactoryAdapter.java
index 63320edee..8076bc10b 100644
--- a/src/main/java/io/usethesource/vallang/impl/fields/AbstractValueFactoryAdapter.java
+++ b/src/main/java/io/usethesource/vallang/impl/fields/AbstractValueFactoryAdapter.java
@@ -30,7 +30,7 @@
* of IValueFactory without having to extend them again and again using
* inheritance. Clients extend this class and override the methods that need
* special handling.
- *
+ *
* Note: this class is intended to be sub-classed. It should not be abstract
* because we want the compiler to check that it provides a facade for the full
* IValueFactory interface.
@@ -88,7 +88,7 @@ public IDateTime datetime(long instant, int timezoneHours, int timezoneMinutes)
public IInteger integer(String i) {
return adapted.integer(i);
}
-
+
@Override
public IInteger integer(int i) {
return adapted.integer(i);
diff --git a/src/main/java/io/usethesource/vallang/impl/fields/ConstructorWithKeywordParametersFacade.java b/src/main/java/io/usethesource/vallang/impl/fields/ConstructorWithKeywordParametersFacade.java
index 7e830919f..42c167f57 100644
--- a/src/main/java/io/usethesource/vallang/impl/fields/ConstructorWithKeywordParametersFacade.java
+++ b/src/main/java/io/usethesource/vallang/impl/fields/ConstructorWithKeywordParametersFacade.java
@@ -7,7 +7,7 @@
*
* Contributors:
*
- * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
+ * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
*******************************************************************************/
package io.usethesource.vallang.impl.fields;
@@ -98,7 +98,7 @@ public boolean equals(@Nullable Object o) {
if (o == this) {
return true;
}
-
+
if (o == null) {
return false;
}
@@ -116,7 +116,7 @@ public boolean equals(@Nullable Object o) {
@Override
public boolean match(IValue other) {
if (other instanceof ConstructorWithKeywordParametersFacade) {
- return content.match(((ConstructorWithKeywordParametersFacade) other).content);
+ return content.match(((ConstructorWithKeywordParametersFacade) other).content);
}
if (other instanceof IConstructor) {
@@ -152,7 +152,7 @@ public boolean hasParameters() {
@Override
@SuppressWarnings("return.type.incompatible")
public Set getParameterNames() {
- return Collections.unmodifiableSet(parameters.keySet());
+ return Collections.unmodifiableSet(parameters.keySet());
}
@Override
diff --git a/src/main/java/io/usethesource/vallang/impl/fields/NodeWithKeywordParametersFacade.java b/src/main/java/io/usethesource/vallang/impl/fields/NodeWithKeywordParametersFacade.java
index 9fdc11d8c..fbd1f5f4a 100644
--- a/src/main/java/io/usethesource/vallang/impl/fields/NodeWithKeywordParametersFacade.java
+++ b/src/main/java/io/usethesource/vallang/impl/fields/NodeWithKeywordParametersFacade.java
@@ -7,7 +7,7 @@
*
* Contributors:
*
- * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
+ * * Michael Steindorfer - Michael.Steindorfer@cwi.nl - CWI
*******************************************************************************/
package io.usethesource.vallang.impl.fields;
@@ -24,107 +24,107 @@
import io.usethesource.vallang.visitors.IValueVisitor;
public class NodeWithKeywordParametersFacade implements INode {
- protected final INode content;
- protected final Map.Immutable parameters;
-
- public NodeWithKeywordParametersFacade(final INode content, final Map.Immutable parameters) {
- this.content = content;
- this.parameters = parameters;
- }
-
- @Override
- public Type getType() {
- return content.getType();
- }
-
- @Override
+ protected final INode content;
+ protected final Map.Immutable parameters;
+
+ public NodeWithKeywordParametersFacade(final INode content, final Map.Immutable parameters) {
+ this.content = content;
+ this.parameters = parameters;
+ }
+
+ @Override
+ public Type getType() {
+ return content.getType();
+ }
+
+ @Override
public INode setChildren(IValue[] childArray) {
return content.setChildren(childArray).asWithKeywordParameters().setParameters(parameters);
}
- @Override
- public T accept(IValueVisitor v) throws E {
- return v.visitNode(this);
- }
-
- @Override
- public IValue get(int i) {
- return content.get(i);
- }
-
- @Override
- public INode set(int i, IValue newChild) {
- INode newContent = content.set(i, newChild);
- return new NodeWithKeywordParametersFacade(newContent, parameters); // TODO: introduce wrap() here as well
- }
-
- @Override
- public int arity() {
- return content.arity();
- }
-
- @Override
- public String toString() {
- return defaultToString();
- }
-
- @Override
- public String getName() {
- return content.getName();
- }
-
- @Override
- public Iterable getChildren() {
- return content.getChildren();
- }
-
- @Override
- public Iterator iterator() {
- return content.iterator();
- }
-
- @Override
- public INode replace(int first, int second, int end, IList repl) {
- INode newContent = content.replace(first, second, end, repl);
- return new NodeWithKeywordParametersFacade(newContent, parameters); // TODO: introduce wrap() here as well
- }
-
- @Override
- public boolean equals(@Nullable Object o) {
- if(o == this) {
- return true;
- }
- if(o == null) {
- return false;
- }
-
- if(o.getClass() == getClass()){
- NodeWithKeywordParametersFacade other = (NodeWithKeywordParametersFacade) o;
-
- return content.equals(other.content) && parameters.equals(other.parameters);
- }
-
- return false;
- }
-
- @Override
- public int hashCode() {
- return 15551 + 7 * content.hashCode() + 11 * parameters.hashCode();
- }
-
- @Override
- public boolean mayHaveKeywordParameters() {
- return true;
- }
-
- @Override
- public IWithKeywordParameters asWithKeywordParameters() {
- return new AbstractDefaultWithKeywordParameters(content, parameters) {
- @Override
- protected INode wrap(INode content, Map.Immutable parameters) {
- return new NodeWithKeywordParametersFacade(content, parameters);
- }
- };
- }
-
+ @Override
+ public T accept(IValueVisitor v) throws E {
+ return v.visitNode(this);
+ }
+
+ @Override
+ public IValue get(int i) {
+ return content.get(i);
+ }
+
+ @Override
+ public INode set(int i, IValue newChild) {
+ INode newContent = content.set(i, newChild);
+ return new NodeWithKeywordParametersFacade(newContent, parameters); // TODO: introduce wrap() here as well
+ }
+
+ @Override
+ public int arity() {
+ return content.arity();
+ }
+
+ @Override
+ public String toString() {
+ return defaultToString();
+ }
+
+ @Override
+ public String getName() {
+ return content.getName();
+ }
+
+ @Override
+ public Iterable getChildren() {
+ return content.getChildren();
+ }
+
+ @Override
+ public Iterator iterator() {
+ return content.iterator();
+ }
+
+ @Override
+ public INode replace(int first, int second, int end, IList repl) {
+ INode newContent = content.replace(first, second, end, repl);
+ return new NodeWithKeywordParametersFacade(newContent, parameters); // TODO: introduce wrap() here as well
+ }
+
+ @Override
+ public boolean equals(@Nullable Object o) {
+ if(o == this) {
+ return true;
+ }
+ if(o == null) {
+ return false;
+ }
+
+ if(o.getClass() == getClass()){
+ NodeWithKeywordParametersFacade other = (NodeWithKeywordParametersFacade) o;
+
+ return content.equals(other.content) && parameters.equals(other.parameters);
+ }
+
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 15551 + 7 * content.hashCode() + 11 * parameters.hashCode();
+ }
+
+ @Override
+ public boolean mayHaveKeywordParameters() {
+ return true;
+ }
+
+ @Override
+ public IWithKeywordParameters asWithKeywordParameters() {
+ return new AbstractDefaultWithKeywordParameters(content, parameters) {
+ @Override
+ protected INode wrap(INode content, Map.Immutable parameters) {
+ return new NodeWithKeywordParametersFacade(content, parameters);
+ }
+ };
+ }
+
}
diff --git a/src/main/java/io/usethesource/vallang/impl/fields/package-info.java b/src/main/java/io/usethesource/vallang/impl/fields/package-info.java
index fe2dd413e..4d6cd06af 100644
--- a/src/main/java/io/usethesource/vallang/impl/fields/package-info.java
+++ b/src/main/java/io/usethesource/vallang/impl/fields/package-info.java
@@ -1,5 +1,5 @@
/**
* This contains generic wrapper classes to implement IAnnotable and IWithKeywordParameters for different
- * host values (INode and IConstructor).
+ * host values (INode and IConstructor).
*/
package io.usethesource.vallang.impl.fields;
\ No newline at end of file
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/Constructor.java b/src/main/java/io/usethesource/vallang/impl/persistent/Constructor.java
index 2ccfceca1..643b08760 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/Constructor.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/Constructor.java
@@ -103,7 +103,7 @@ public boolean equals(@Nullable Object o){
return false;
}
-
+
@Override
public String toString() {
return defaultToString();
@@ -726,7 +726,7 @@ public IConstructor set(int index, IValue newArg) {
public int hashCode() {
return super.hashCode();
}
-
+
@Override
public boolean equals(@Nullable Object o) {
if (o == this) {
@@ -823,14 +823,14 @@ public Type getUninstantiatedConstructorType() {
/**
* As empty constructors are very common and are only based on a type that is already maximally shared we also maximally share the Constructor0 instances
- *
+ *
* This descreases both memory footprint and allocation overhead.
*/
private static final LoadingCache EMPTY_CONSTRUCTOR_SINGLETONS = Caffeine.newBuilder().build(Constructor0::new);
/*package*/ static IConstructor newConstructor(Type constructorType, IValue[] children) {
assert IConstructor.assertTypeCorrectConstructorApplication(constructorType, children);
-
+
if (constructorType.isParameterized()) {
return new TypeParameterizedConstructorN(constructorType, children);
}
@@ -853,7 +853,7 @@ private static T nonNull(@Nullable T value) {
}
return value;
}
-
+
/*package*/ static IConstructor newConstructor(Type constructorType, IValue[] children, Map kwParams) {
IConstructor r = newConstructor(constructorType, children);
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/EmptySet.java b/src/main/java/io/usethesource/vallang/impl/persistent/EmptySet.java
index d759e3335..a9467066d 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/EmptySet.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/EmptySet.java
@@ -136,7 +136,7 @@ public ISet product(ISet that) {
public boolean isSubsetOf(ISet other) {
return true;
}
-
+
@Override
public IRelation asRelation() {
return new IRelation() {
@@ -144,42 +144,42 @@ public IRelation asRelation() {
public ISet asContainer() {
return EmptySet.this;
}
-
+
@Override
public ISet compose(IRelation that) {
return EmptySet.this;
}
-
+
@Override
public ISet closure() {
return EmptySet.this;
}
-
+
@Override
public ISet closureStar() {
return EmptySet.this;
}
-
+
@Override
public ISet carrier() {
return EmptySet.this;
}
-
+
@Override
public ISet domain() {
return EmptySet.this;
}
-
+
@Override
public ISet range() {
return EmptySet.this;
}
-
+
@Override
public ISet empty() {
return EmptySet.this;
}
-
+
@Override
public ISet index(IValue key) {
return EmptySet.this;
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/List.java b/src/main/java/io/usethesource/vallang/impl/persistent/List.java
index e6373e049..47a349905 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/List.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/List.java
@@ -192,7 +192,7 @@ IList materializedSublist(int offset, int length){
Type oldElementType = getType().getElementType();
Type newElementType = TypeFactory.getInstance().voidType();
-
+
for(IValue el : newData) {
if (newElementType == oldElementType) {
// the type can only get more specific
@@ -223,7 +223,7 @@ public boolean equals(@Nullable Object o){
if (o == this) {
return true;
}
-
+
if (o == null) {
return false;
}
@@ -326,7 +326,7 @@ public boolean equals(@Nullable Object o){
if (o == this) {
return true;
}
-
+
if (o == null) {
return false;
}
@@ -340,7 +340,7 @@ public boolean equals(@Nullable Object o){
if (o instanceof IList) {
return defaultEquals(o);
}
-
+
return false;
}
@@ -503,7 +503,7 @@ public IList replace(int arg0, int arg1, int arg2, IList arg3) {
@Override
public IList reverse() {
ListWriter w = new ListWriter();
- for(int i = offset + length - 1; i >= offset; i--){
+ for(int i = offset + length - 1; i >= offset; i--){
w.append(base.get(i));
}
return w.done();
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/ListRelation.java b/src/main/java/io/usethesource/vallang/impl/persistent/ListRelation.java
index d029d4fb9..bc895a721 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/ListRelation.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/ListRelation.java
@@ -14,12 +14,12 @@ public class ListRelation implements IRelation {
public ListRelation(IList list) {
this.list = list;
}
-
+
@Override
public IList asContainer() {
return list;
}
-
+
@Override
public IList closure() {
// will throw exception if not binary and reflexive
@@ -41,11 +41,11 @@ public IList closure() {
w.append(t1);
}
}
-
+
tmp = tmp.asContainer().concat(w.done()).asRelation();
addedTuples.clear();
}
-
+
return tmp.asContainer();
}
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/ListWriter.java b/src/main/java/io/usethesource/vallang/impl/persistent/ListWriter.java
index c18220ad7..84b3f9dbe 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/ListWriter.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/ListWriter.java
@@ -25,218 +25,218 @@
/**
* Implementation of IListWriter.
- *
+ *
* @author Arnold Lankamp
*/
/*package*/ class ListWriter implements IListWriter{
private Type elementType;
- private final ShareableValuesList data;
- private @MonotonicNonNull IList constructedList;
- private final boolean unique;
-
- /*package*/ ListWriter() {
- super();
-
- this.elementType = TypeFactory.getInstance().voidType();
- data = new ShareableValuesList();
- unique = false;
- }
-
- private ListWriter(boolean unique) {
- this.elementType = TypeFactory.getInstance().voidType();
+ private final ShareableValuesList data;
+ private @MonotonicNonNull IList constructedList;
+ private final boolean unique;
+
+ /*package*/ ListWriter() {
+ super();
+
+ this.elementType = TypeFactory.getInstance().voidType();
+ data = new ShareableValuesList();
+ unique = false;
+ }
+
+ private ListWriter(boolean unique) {
+ this.elementType = TypeFactory.getInstance().voidType();
data = new ShareableValuesList();
- this.unique = unique;
- }
-
- @Override
+ this.unique = unique;
+ }
+
+ @Override
public IWriter unique() {
return new ListWriter(true);
}
- @Override
- public Iterator iterator() {
- return data.iterator();
- }
-
- /*package*/ ListWriter(Type elementType, ShareableValuesList data){
- super();
-
- this.elementType = elementType;
- this.data = data;
- this.unique = false;
- }
-
- @Override
- public void insertTuple(IValue... fields) {
- insert(Tuple.newTuple(fields));
- }
-
- public void append(IValue element){
- checkMutation();
-
- if (unique && data.contains(element)) {
- return;
+ @Override
+ public Iterator iterator() {
+ return data.iterator();
+ }
+
+ /*package*/ ListWriter(Type elementType, ShareableValuesList data){
+ super();
+
+ this.elementType = elementType;
+ this.data = data;
+ this.unique = false;
+ }
+
+ @Override
+ public void insertTuple(IValue... fields) {
+ insert(Tuple.newTuple(fields));
+ }
+
+ public void append(IValue element){
+ checkMutation();
+
+ if (unique && data.contains(element)) {
+ return;
+ }
+
+ updateType(element);
+ data.append(element);
+ }
+
+ @Override
+ public void appendTuple(IValue... fields) {
+ append(Tuple.newTuple(fields));
+ }
+
+ private void updateType(IValue element) {
+ elementType = elementType.lub(element.getType());
+ }
+
+ @Override
+ public void append(IValue... elems){
+ checkMutation();
+ boolean notUnique = false;
+
+ for (IValue elem : elems){
+ if (unique && data.contains(elem)) {
+ notUnique = true;
+ break;
+ }
+ updateType(elem);
+ }
+
+ if (!notUnique) {
+ data.appendAll(elems);
+ }
+ else {
+ for (IValue next : elems) {
+ if (unique && data.contains(next)) {
+ continue;
+ }
+
+ updateType(next);
+ data.append(next);
+ }
+ }
+ }
+
+ @Override
+ public void appendAll(Iterable collection){
+ checkMutation();
+
+ for (IValue next : collection) {
+ if (unique && data.contains(next)) {
+ continue;
+ }
+
+ updateType(next);
+ data.append(next);
+ }
+ }
+
+ public void insert(IValue elem){
+ checkMutation();
+ if (unique && data.contains(elem)) {
+ return;
+ }
+ updateType(elem);
+ data.insert(elem);
+ }
+
+ @Override
+ public void insert(IValue... elements){
+ insert(elements, 0, elements.length);
+ }
+
+ @Override
+ public void insert(IValue[] elements, int start, int length){
+ checkMutation();
+ checkBounds(elements, start, length);
+
+ for(int i = start + length - 1; i >= start; i--){
+ updateType(elements[i]);
+
+ if (unique && data.contains(elements[i])) {
+ continue;
+ }
+
+ data.insert(elements[i]);
}
-
- updateType(element);
- data.append(element);
- }
-
- @Override
- public void appendTuple(IValue... fields) {
- append(Tuple.newTuple(fields));
- }
-
- private void updateType(IValue element) {
- elementType = elementType.lub(element.getType());
- }
-
- @Override
- public void append(IValue... elems){
- checkMutation();
- boolean notUnique = false;
-
- for (IValue elem : elems){
- if (unique && data.contains(elem)) {
- notUnique = true;
- break;
- }
- updateType(elem);
- }
-
- if (!notUnique) {
- data.appendAll(elems);
- }
- else {
- for (IValue next : elems) {
- if (unique && data.contains(next)) {
- continue;
- }
-
- updateType(next);
- data.append(next);
- }
- }
- }
-
- @Override
- public void appendAll(Iterable collection){
- checkMutation();
-
- for (IValue next : collection) {
- if (unique && data.contains(next)) {
- continue;
- }
-
- updateType(next);
- data.append(next);
- }
- }
-
- public void insert(IValue elem){
- checkMutation();
- if (unique && data.contains(elem)) {
- return;
- }
- updateType(elem);
- data.insert(elem);
- }
-
- @Override
- public void insert(IValue... elements){
- insert(elements, 0, elements.length);
- }
-
- @Override
- public void insert(IValue[] elements, int start, int length){
- checkMutation();
- checkBounds(elements, start, length);
-
- for(int i = start + length - 1; i >= start; i--){
- updateType(elements[i]);
-
- if (unique && data.contains(elements[i])) {
- continue;
- }
-
- data.insert(elements[i]);
- }
- }
-
- @Override
- public void insertAll(Iterable collection){
- checkMutation();
-
- for (IValue next : collection) {
- if (unique && data.contains(next)) {
+ }
+
+ @Override
+ public void insertAll(Iterable collection){
+ checkMutation();
+
+ for (IValue next : collection) {
+ if (unique && data.contains(next)) {
continue;
}
- updateType(next);
- data.insert(next);
- }
- }
-
- @Override
- public void insertAt(int index, IValue... elements){
- insertAt(index, elements, 0, 0);
- }
-
- @Override
- public void insertAt(int index, IValue[] elements, int start, int length){
- checkMutation();
- checkBounds(elements, start, length);
-
- for(int i = start + length - 1; i >= start; i--){
- updateType(elements[i]);
- data.insertAt(index, elements[i]);
- }
- }
-
- @Override
- public IValue replaceAt(int index, IValue element){
- checkMutation();
-
- updateType(element);
- return data.set(index, element);
- }
-
- @Override
- public IValue get(int i) throws IndexOutOfBoundsException {
- return data.get(i);
- }
-
- @Override
- public int length() {
- return data.size();
- }
-
- protected void checkMutation() {
- if (constructedList != null) {
- throw new UnsupportedOperationException("Mutation of a finalized list is not supported.");
- }
- }
-
- private void checkBounds(IValue[] elems, int start, int length){
- if (start < 0) {
- throw new ArrayIndexOutOfBoundsException("start < 0");
- }
-
- if ((start + length) > elems.length) {
- throw new ArrayIndexOutOfBoundsException("(start + length) > elems.length");
- }
- }
-
- @Override
- public IList done() {
- if (constructedList == null) {
- constructedList = List.newList(elementType, data);
- }
-
- return constructedList;
- }
-
- @Override
- public Supplier> supplier() {
- return () -> new ListWriter();
- }
+ updateType(next);
+ data.insert(next);
+ }
+ }
+
+ @Override
+ public void insertAt(int index, IValue... elements){
+ insertAt(index, elements, 0, 0);
+ }
+
+ @Override
+ public void insertAt(int index, IValue[] elements, int start, int length){
+ checkMutation();
+ checkBounds(elements, start, length);
+
+ for(int i = start + length - 1; i >= start; i--){
+ updateType(elements[i]);
+ data.insertAt(index, elements[i]);
+ }
+ }
+
+ @Override
+ public IValue replaceAt(int index, IValue element){
+ checkMutation();
+
+ updateType(element);
+ return data.set(index, element);
+ }
+
+ @Override
+ public IValue get(int i) throws IndexOutOfBoundsException {
+ return data.get(i);
+ }
+
+ @Override
+ public int length() {
+ return data.size();
+ }
+
+ protected void checkMutation() {
+ if (constructedList != null) {
+ throw new UnsupportedOperationException("Mutation of a finalized list is not supported.");
+ }
+ }
+
+ private void checkBounds(IValue[] elems, int start, int length){
+ if (start < 0) {
+ throw new ArrayIndexOutOfBoundsException("start < 0");
+ }
+
+ if ((start + length) > elems.length) {
+ throw new ArrayIndexOutOfBoundsException("(start + length) > elems.length");
+ }
+ }
+
+ @Override
+ public IList done() {
+ if (constructedList == null) {
+ constructedList = List.newList(elementType, data);
+ }
+
+ return constructedList;
+ }
+
+ @Override
+ public Supplier> supplier() {
+ return () -> new ListWriter();
+ }
}
\ No newline at end of file
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/MapWriter.java b/src/main/java/io/usethesource/vallang/impl/persistent/MapWriter.java
index 5ec06c50c..b199841c8 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/MapWriter.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/MapWriter.java
@@ -29,102 +29,102 @@
final class MapWriter implements IMapWriter {
- private AbstractTypeBag keyTypeBag = AbstractTypeBag.of();
- private AbstractTypeBag valTypeBag = AbstractTypeBag.of();
- private final Map.Transient mapContent = Map.Transient.of();
-
- private @MonotonicNonNull IMap constructedMap;
-
- @Override
- public void put(IValue key, IValue value) {
- checkMutation();
-
- final Type keyType = key.getType();
- final Type valType = value.getType();
-
- int oldSize = mapContent.size();
-
- final IValue replaced = mapContent.__put(key, value);
-
- if (oldSize == mapContent.size() && replaced == null) {
- // update nothing because they key/value pair was already there
- }
- else if (replaced != null) {
- // only update the val since the key was already there
- valTypeBag = valTypeBag.decrease(replaced.getType()).increase(valType);
- }
- else {
- // add the new entry for both bags since its entirely new
- keyTypeBag = keyTypeBag.increase(keyType);
- valTypeBag = valTypeBag.increase(valType);
- }
-
- assert mapContent.size() == keyTypeBag.sum();
- }
+ private AbstractTypeBag keyTypeBag = AbstractTypeBag.of();
+ private AbstractTypeBag valTypeBag = AbstractTypeBag.of();
+ private final Map.Transient mapContent = Map.Transient.of();
+
+ private @MonotonicNonNull IMap constructedMap;
+
+ @Override
+ public void put(IValue key, IValue value) {
+ checkMutation();
+
+ final Type keyType = key.getType();
+ final Type valType = value.getType();
+
+ int oldSize = mapContent.size();
+
+ final IValue replaced = mapContent.__put(key, value);
+
+ if (oldSize == mapContent.size() && replaced == null) {
+ // update nothing because they key/value pair was already there
+ }
+ else if (replaced != null) {
+ // only update the val since the key was already there
+ valTypeBag = valTypeBag.decrease(replaced.getType()).increase(valType);
+ }
+ else {
+ // add the new entry for both bags since its entirely new
+ keyTypeBag = keyTypeBag.increase(keyType);
+ valTypeBag = valTypeBag.increase(valType);
+ }
+
+ assert mapContent.size() == keyTypeBag.sum();
+ }
@Override
- public void putAll(IMap map) {
- putAll(map.entryIterator());
- }
+ public void putAll(IMap map) {
+ putAll(map.entryIterator());
+ }
- @Override
- public void putAll(java.util.Map map) {
- putAll(map.entrySet().iterator());
- }
+ @Override
+ public void putAll(java.util.Map map) {
+ putAll(map.entrySet().iterator());
+ }
- private void putAll(Iterator> entryIterator) {
- checkMutation();
+ private void putAll(Iterator> entryIterator) {
+ checkMutation();
- while (entryIterator.hasNext()) {
- Entry entry = entryIterator.next();
- IValue key = entry.getKey();
- IValue value = entry.getValue();
+ while (entryIterator.hasNext()) {
+ Entry entry = entryIterator.next();
+ IValue key = entry.getKey();
+ IValue value = entry.getValue();
- this.put(key, value);
- }
- }
+ this.put(key, value);
+ }
+ }
- @Override
- public void insert(IValue... values) {
- insertAll(Arrays.asList(values));
- }
+ @Override
+ public void insert(IValue... values) {
+ insertAll(Arrays.asList(values));
+ }
- @Override
- public void insertAll(Iterable collection) {
- checkMutation();
+ @Override
+ public void insertAll(Iterable collection) {
+ checkMutation();
- Iterator collectionIterator = collection.iterator();
- while (collectionIterator.hasNext()) {
- final Object item = collectionIterator.next();
+ Iterator collectionIterator = collection.iterator();
+ while (collectionIterator.hasNext()) {
+ final Object item = collectionIterator.next();
- if (!(item instanceof ITuple)) {
- throw new IllegalArgumentException("Argument must be of ITuple type.");
- }
+ if (!(item instanceof ITuple)) {
+ throw new IllegalArgumentException("Argument must be of ITuple type.");
+ }
- final ITuple tuple = (ITuple) item;
+ final ITuple tuple = (ITuple) item;
- if (tuple.arity() != 2) {
- throw new IllegalArgumentException("Tuple must have an arity of 2.");
- }
+ if (tuple.arity() != 2) {
+ throw new IllegalArgumentException("Tuple must have an arity of 2.");
+ }
- put(tuple.get(0), tuple.get(1));
- }
- }
+ put(tuple.get(0), tuple.get(1));
+ }
+ }
- protected void checkMutation() {
- if (constructedMap != null) {
- throw new UnsupportedOperationException("Mutation of a finalized map is not supported.");
- }
- }
+ protected void checkMutation() {
+ if (constructedMap != null) {
+ throw new UnsupportedOperationException("Mutation of a finalized map is not supported.");
+ }
+ }
- @Override
- public IMap done() {
- if (constructedMap == null) {
- constructedMap = new PersistentHashMap(keyTypeBag, valTypeBag, mapContent.freeze());
- }
+ @Override
+ public IMap done() {
+ if (constructedMap == null) {
+ constructedMap = new PersistentHashMap(keyTypeBag, valTypeBag, mapContent.freeze());
+ }
- return constructedMap;
- }
+ return constructedMap;
+ }
@Override
public void insertTuple(IValue... fields) {
@@ -135,7 +135,7 @@ public void insertTuple(IValue... fields) {
public Iterator iterator() {
return mapContent.keyIterator();
}
-
+
@Override
public IValue get(IValue key) {
return mapContent.get(key);
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/Node.java b/src/main/java/io/usethesource/vallang/impl/persistent/Node.java
index 407f13b18..a905228ff 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/Node.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/Node.java
@@ -24,130 +24,130 @@
import io.usethesource.vallang.type.TypeFactory;
/*package*/ class Node implements INode {
- protected static final Type NODE_TYPE = TF.nodeType();
- protected static final Type VALUE_TYPE = TypeFactory.getInstance().valueType();
-
- protected final String name;
- protected final IValue[] children;
-
- /*package*/ static INode newNode(String name, IValue[] children) {
- return new Node(name, children);
- }
-
- Node(String name, IValue[] children) {
- super();
-
- this.name = name.intern();
- this.children = children;
- }
-
- /*package*/ static INode newNode(String name, IList children) {
- return new Node(name, children);
- }
-
- private Node(String name, IList children) {
- super();
- IValue[] childArray = new IValue[children.length()];
- this.name = name.intern();
- for(int i = 0; i < childArray.length; i++){
- childArray[i] = children.get(i);
- }
- this.children = childArray;
- }
-
- @Override
- public String toString() {
- return defaultToString();
- }
-
- @Override
- public Type getType(){
- return NODE_TYPE;
- }
-
- @Override
- public int arity(){
- return children.length;
- }
-
- @Override
+ protected static final Type NODE_TYPE = TF.nodeType();
+ protected static final Type VALUE_TYPE = TypeFactory.getInstance().valueType();
+
+ protected final String name;
+ protected final IValue[] children;
+
+ /*package*/ static INode newNode(String name, IValue[] children) {
+ return new Node(name, children);
+ }
+
+ Node(String name, IValue[] children) {
+ super();
+
+ this.name = name.intern();
+ this.children = children;
+ }
+
+ /*package*/ static INode newNode(String name, IList children) {
+ return new Node(name, children);
+ }
+
+ private Node(String name, IList children) {
+ super();
+ IValue[] childArray = new IValue[children.length()];
+ this.name = name.intern();
+ for(int i = 0; i < childArray.length; i++){
+ childArray[i] = children.get(i);
+ }
+ this.children = childArray;
+ }
+
+ @Override
+ public String toString() {
+ return defaultToString();
+ }
+
+ @Override
+ public Type getType(){
+ return NODE_TYPE;
+ }
+
+ @Override
+ public int arity(){
+ return children.length;
+ }
+
+ @Override
public INode setChildren(IValue[] childArray) {
return new Node(name, childArray);
}
-
- @Override
- public IValue get(int i){
- return children[i];
- }
-
- @Override
- public String getName(){
- return name;
- }
-
- @Override
- public Iterator iterator(){
- return ArrayIterator.of(children);
- }
-
- @Override
- public Iterable getChildren(){
- return this;
- }
-
- @Override
- public INode set(int i, IValue arg){
- IValue[] newChildren = children.clone();
- newChildren[i] = arg;
-
- return newNode(name, newChildren);
- }
-
- @Override
- public int hashCode() {
- int hash = name.hashCode();
-
- for(int i = children.length - 1; i >= 0; i--){
- hash = (hash << 23) + (hash >> 5);
- hash ^= children[i].hashCode();
- }
- return hash;
- }
-
- @Override
- public boolean equals(@Nullable Object o){
- if (o == this) {
- return true;
- }
-
- if (o == null) {
- return false;
- }
-
- if (o.getClass() != getClass()) {
- return false;
- }
-
- Node other = (Node) o;
-
- // Yes '!=' works here, since it has been interned.
- if (name != other.name) {
- return false;
- }
-
- IValue[] otherChildren = other.children;
- int nrOfChildren = children.length;
-
- if (otherChildren.length != nrOfChildren) {
- return false;
- }
-
- for (int i = nrOfChildren - 1; i >= 0; i--) {
- if (!otherChildren[i].equals(children[i])) {
- return false;
- }
- }
-
- return true;
- }
+
+ @Override
+ public IValue get(int i){
+ return children[i];
+ }
+
+ @Override
+ public String getName(){
+ return name;
+ }
+
+ @Override
+ public Iterator iterator(){
+ return ArrayIterator.of(children);
+ }
+
+ @Override
+ public Iterable getChildren(){
+ return this;
+ }
+
+ @Override
+ public INode set(int i, IValue arg){
+ IValue[] newChildren = children.clone();
+ newChildren[i] = arg;
+
+ return newNode(name, newChildren);
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = name.hashCode();
+
+ for(int i = children.length - 1; i >= 0; i--){
+ hash = (hash << 23) + (hash >> 5);
+ hash ^= children[i].hashCode();
+ }
+ return hash;
+ }
+
+ @Override
+ public boolean equals(@Nullable Object o){
+ if (o == this) {
+ return true;
+ }
+
+ if (o == null) {
+ return false;
+ }
+
+ if (o.getClass() != getClass()) {
+ return false;
+ }
+
+ Node other = (Node) o;
+
+ // Yes '!=' works here, since it has been interned.
+ if (name != other.name) {
+ return false;
+ }
+
+ IValue[] otherChildren = other.children;
+ int nrOfChildren = children.length;
+
+ if (otherChildren.length != nrOfChildren) {
+ return false;
+ }
+
+ for (int i = nrOfChildren - 1; i >= 0; i--) {
+ if (!otherChildren[i].equals(children[i])) {
+ return false;
+ }
+ }
+
+ return true;
+ }
}
diff --git a/src/main/java/io/usethesource/vallang/impl/persistent/PersistentHashIndexedBinaryRelation.java b/src/main/java/io/usethesource/vallang/impl/persistent/PersistentHashIndexedBinaryRelation.java
index f9c936224..75191d9aa 100644
--- a/src/main/java/io/usethesource/vallang/impl/persistent/PersistentHashIndexedBinaryRelation.java
+++ b/src/main/java/io/usethesource/vallang/impl/persistent/PersistentHashIndexedBinaryRelation.java
@@ -43,702 +43,702 @@
import io.usethesource.vallang.util.AbstractTypeBag;
/**
- * Implements both ISet and IRelation, by indexing on the first column
- * and reconstructing binary tuples while iterating. This class
- * is faster for compose and closure because the index has been pre-computed.
- */
+* Implements both ISet and IRelation, by indexing on the first column
+* and reconstructing binary tuples while iterating. This class
+* is faster for compose and closure because the index has been pre-computed.
+*/
public final class PersistentHashIndexedBinaryRelation implements ISet, IRelation {
- private @MonotonicNonNull Type cachedRelationType;
- private final AbstractTypeBag keyTypeBag;
- private final AbstractTypeBag valTypeBag;
- private final SetMultimap.Immutable content;
-
- /**
- * Construction of persistent indexed binary relation with multi-map backend.
- *
- * DO NOT CALL OUTSIDE OF {@link PersistentSetFactory}.
- *
- * @param keyTypeBag precise dynamic type of first data column
- * @param valTypeBag precise dynamic type of second data column
- * @param content immutable multi-map
- */
- PersistentHashIndexedBinaryRelation(AbstractTypeBag keyTypeBag, AbstractTypeBag valTypeBag,
- SetMultimap.Immutable content) {
- this.keyTypeBag = Objects.requireNonNull(keyTypeBag);
- this.valTypeBag = Objects.requireNonNull(valTypeBag);
- this.content = Objects.requireNonNull(content);
-
- assert USE_MULTIMAP_BINARY_RELATIONS
+ private @MonotonicNonNull Type cachedRelationType;
+ private final AbstractTypeBag keyTypeBag;
+ private final AbstractTypeBag valTypeBag;
+ private final SetMultimap.Immutable content;
+
+ /**
+ * Construction of persistent indexed binary relation with multi-map backend.
+ *
+ * DO NOT CALL OUTSIDE OF {@link PersistentSetFactory}.
+ *
+ * @param keyTypeBag precise dynamic type of first data column
+ * @param valTypeBag precise dynamic type of second data column
+ * @param content immutable multi-map
+ */
+ PersistentHashIndexedBinaryRelation(AbstractTypeBag keyTypeBag, AbstractTypeBag valTypeBag,
+ SetMultimap.Immutable content) {
+ this.keyTypeBag = Objects.requireNonNull(keyTypeBag);
+ this.valTypeBag = Objects.requireNonNull(valTypeBag);
+ this.content = Objects.requireNonNull(content);
+
+ assert USE_MULTIMAP_BINARY_RELATIONS
&& isTupleOfArityTwo.test(TF.tupleType(keyTypeBag.lub(), valTypeBag.lub()));
- assert USE_MULTIMAP_BINARY_RELATIONS && !content.isEmpty();
- assert USE_MULTIMAP_BINARY_RELATIONS && checkDynamicType(keyTypeBag, valTypeBag, content);
- }
+ assert USE_MULTIMAP_BINARY_RELATIONS && !content.isEmpty();
+ assert USE_MULTIMAP_BINARY_RELATIONS && checkDynamicType(keyTypeBag, valTypeBag, content);
+ }
- @Override
- public IRelation asRelation() {
- return this;
- }
+ @Override
+ public IRelation asRelation() {
+ return this;
+ }
- private static final boolean checkDynamicType(final AbstractTypeBag keyTypeBag,
- final AbstractTypeBag valTypeBag, final SetMultimap.Immutable content) {
+ private static final boolean checkDynamicType(final AbstractTypeBag keyTypeBag,
+ final AbstractTypeBag valTypeBag, final SetMultimap.Immutable content) {
- final AbstractTypeBag expectedKeyTypeBag = calcTypeBag(content, Map.Entry::getKey);
- final AbstractTypeBag expectedValTypeBag = calcTypeBag(content, Map.Entry::getValue);
+ final AbstractTypeBag expectedKeyTypeBag = calcTypeBag(content, Map.Entry::getKey);
+ final AbstractTypeBag expectedValTypeBag = calcTypeBag(content, Map.Entry::getValue);
- boolean keyTypesEqual = expectedKeyTypeBag.equals(keyTypeBag);
- boolean valTypesEqual = expectedValTypeBag.equals(valTypeBag);
+ boolean keyTypesEqual = expectedKeyTypeBag.equals(keyTypeBag);
+ boolean valTypesEqual = expectedValTypeBag.equals(valTypeBag);
- return keyTypesEqual && valTypesEqual;
- }
-
- @Override
- public ISetWriter writer() {
- return ValueFactory.getInstance().setWriter();
- }
+ return keyTypesEqual && valTypesEqual;
+ }
- @Override
- public Type getType() {
- if (cachedRelationType == null) {
- cachedRelationType = TF.relType(keyTypeBag.lub(), valTypeBag.lub());
+ @Override
+ public ISetWriter writer() {
+ return ValueFactory.getInstance().setWriter();
}
- return cachedRelationType;
- }
- private final BiFunction tupleConverter() {
- return (first, second) -> Tuple.newTuple(first, second);
- }
+ @Override
+ public Type getType() {
+ if (cachedRelationType == null) {
+ cachedRelationType = TF.relType(keyTypeBag.lub(), valTypeBag.lub());
+ }
+ return cachedRelationType;
+ }
- @Override
- public boolean isEmpty() {
- return content.isEmpty();
- }
+ private final BiFunction tupleConverter() {
+ return (first, second) -> Tuple.newTuple(first, second);
+ }
- @Override
- public ISet insert(IValue value) {
- if (!isTupleOfArityTwo.test(value.getType())) {
- /*
- * NOTE: conversion of set representations are assumed to be scarce, but are costly if they
- * happen though.
- */
- final Stream tupleStream = content.tupleStream(tupleConverter());
- return Stream.concat(tupleStream, Stream.of(value)).collect(ValueCollectors.toSet());
+ @Override
+ public boolean isEmpty() {
+ return content.isEmpty();
}
- final ITuple tuple = (ITuple) value;
- final IValue key = tuple.get(0);
- final IValue val = tuple.get(1);
+ @Override
+ public ISet insert(IValue value) {
+ if (!isTupleOfArityTwo.test(value.getType())) {
+ /*
+ * NOTE: conversion of set representations are assumed to be scarce, but are costly if they
+ * happen though.
+ */
+ final Stream tupleStream = content.tupleStream(tupleConverter());
+ return Stream.concat(tupleStream, Stream.of(value)).collect(ValueCollectors.toSet());
+ }
+
+ final ITuple tuple = (ITuple) value;
+ final IValue key = tuple.get(0);
+ final IValue val = tuple.get(1);
+
+ final SetMultimap.Immutable contentNew = content.__insert(key, val);
- final SetMultimap.Immutable contentNew = content.__insert(key, val);
+ if (content == contentNew) {
+ return this;
+ }
- if (content == contentNew) {
- return this;
+ final AbstractTypeBag keyTypeBagNew = keyTypeBag.increase(key.getType());
+ final AbstractTypeBag valTypeBagNew = valTypeBag.increase(val.getType());
+
+ return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, contentNew);
}
- final AbstractTypeBag keyTypeBagNew = keyTypeBag.increase(key.getType());
- final AbstractTypeBag valTypeBagNew = valTypeBag.increase(val.getType());
+ @Override
+ public ISet delete(IValue value) {
+ if (!isTupleOfArityTwo.test(value.getType())) {
+ return this;
+ }
+
+ final ITuple tuple = (ITuple) value;
+ final IValue key = tuple.get(0);
+ final IValue val = tuple.get(1);
+
+ final SetMultimap.Immutable contentNew = content.__remove(key, val);
+
+ if (content == contentNew) {
+ return this;
+ }
+
+ final AbstractTypeBag keyTypeBagNew = keyTypeBag.decrease(key.getType());
+ final AbstractTypeBag valTypeBagNew = valTypeBag.decrease(val.getType());
- return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, contentNew);
- }
+ return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, contentNew);
+ }
- @Override
- public ISet delete(IValue value) {
- if (!isTupleOfArityTwo.test(value.getType())) {
- return this;
+ @Override
+ public int size() {
+ return content.size();
}
- final ITuple tuple = (ITuple) value;
- final IValue key = tuple.get(0);
- final IValue val = tuple.get(1);
+ @Override
+ public boolean contains(IValue value) {
+ if (!isTupleOfArityTwo.test(value.getType())) {
+ return false;
+ }
- final SetMultimap.Immutable contentNew = content.__remove(key, val);
+ final ITuple tuple = (ITuple) value;
+ final IValue key = tuple.get(0);
+ final IValue val = tuple.get(1);
- if (content == contentNew) {
- return this;
+ return content.containsEntry(key, val);
}
- final AbstractTypeBag keyTypeBagNew = keyTypeBag.decrease(key.getType());
- final AbstractTypeBag valTypeBagNew = valTypeBag.decrease(val.getType());
+ @Override
+ public Iterator iterator() {
+ return content.tupleIterator(Tuple::newTuple);
+ }
- return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, contentNew);
- }
+ @Override
+ public int hashCode() {
+ final int hashCode =
+ StreamSupport.stream(spliterator(), false).mapToInt(tuple -> tuple.hashCode()).sum();
- @Override
- public int size() {
- return content.size();
- }
+ return hashCode;
+ }
- @Override
- public boolean contains(IValue value) {
- if (!isTupleOfArityTwo.test(value.getType())) {
- return false;
+ @Override
+ public String toString() {
+ return defaultToString();
}
- final ITuple tuple = (ITuple) value;
- final IValue key = tuple.get(0);
- final IValue val = tuple.get(1);
+ @Override
+ public boolean equals(@Nullable Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (other == null) {
+ return false;
+ }
+
+ if (other instanceof PersistentHashIndexedBinaryRelation) {
+ PersistentHashIndexedBinaryRelation that = (PersistentHashIndexedBinaryRelation) other;
- return content.containsEntry(key, val);
- }
+ if (this.getType() != that.getType()) {
+ return false;
+ }
- @Override
- public Iterator iterator() {
- return content.tupleIterator(Tuple::newTuple);
- }
+ if (this.size() != that.size()) {
+ return false;
+ }
- @Override
- public int hashCode() {
- final int hashCode =
- StreamSupport.stream(spliterator(), false).mapToInt(tuple -> tuple.hashCode()).sum();
+ return content.equals(that.content);
+ }
- return hashCode;
- }
-
- @Override
- public String toString() {
- return defaultToString();
- }
+ if (other instanceof ISet) {
+ return defaultEquals(other);
+ }
- @Override
- public boolean equals(@Nullable Object other) {
- if (other == this) {
- return true;
+ return false;
}
-
- if (other == null) {
- return false;
+
+ @Override
+ public ISet union(ISet other) {
+ if (other == this) {
+ return this;
+ }
+ if (other == null) {
+ return this;
+ }
+
+ if (other instanceof PersistentHashIndexedBinaryRelation) {
+ PersistentHashIndexedBinaryRelation that = (PersistentHashIndexedBinaryRelation) other;
+
+ final SetMultimap.Immutable one;
+ final SetMultimap.Immutable two;
+ AbstractTypeBag keyTypeBagNew;
+ AbstractTypeBag valTypeBagNew;
+ final ISet def;
+
+ if (that.size() >= this.size()) {
+ def = that;
+ one = that.content;
+ keyTypeBagNew = that.keyTypeBag;
+ valTypeBagNew = that.valTypeBag;
+ two = this.content;
+ } else {
+ def = this;
+ one = this.content;
+ keyTypeBagNew = this.keyTypeBag;
+ valTypeBagNew = this.valTypeBag;
+ two = that.content;
+ }
+
+ final SetMultimap.Transient tmp = one.asTransient();
+ boolean modified = false;
+
+ for (Map.Entry entry : two.entrySet()) {
+ final IValue key = entry.getKey();
+ final IValue val = entry.getValue();
+
+ if (tmp.__insert(key, val)) {
+ modified = true;
+ keyTypeBagNew = keyTypeBagNew.increase(key.getType());
+ valTypeBagNew = valTypeBagNew.increase(val.getType());
+ }
+ }
+
+ if (modified) {
+ return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, tmp.freeze());
+ }
+ return def;
+ } else {
+ return ISet.super.union(other);
+ }
}
- if (other instanceof PersistentHashIndexedBinaryRelation) {
- PersistentHashIndexedBinaryRelation that = (PersistentHashIndexedBinaryRelation) other;
+ @Override
+ public ISet intersect(ISet other) {
+ if (other == this) {
+ return this;
+ }
+ if (other == null) {
+ return EmptySet.EMPTY_SET;
+ }
+
+ if (other instanceof PersistentHashIndexedBinaryRelation) {
+ PersistentHashIndexedBinaryRelation that = (PersistentHashIndexedBinaryRelation) other;
+
+ final SetMultimap.Immutable one;
+ final SetMultimap.Immutable two;
+ AbstractTypeBag keyTypeBagNew;
+ AbstractTypeBag valTypeBagNew;
+ final ISet def;
+
+ if (that.size() >= this.size()) {
+ def = this;
+ one = this.content;
+ keyTypeBagNew = this.keyTypeBag;
+ valTypeBagNew = this.valTypeBag;
+ two = that.content;
+ } else {
+ def = that;
+ one = that.content;
+ keyTypeBagNew = that.keyTypeBag;
+ valTypeBagNew = that.valTypeBag;
+ two = this.content;
+ }
- if (this.getType() != that.getType()) {
- return false;
- }
+ final SetMultimap.Transient tmp = one.asTransient();
+ boolean modified = false;
- if (this.size() != that.size()) {
- return false;
- }
+ for (Iterator> it = tmp.entryIterator(); it.hasNext(); ) {
+ final Map.Entry tuple = it.next();
+ final IValue key = tuple.getKey();
+ final IValue val = tuple.getValue();
+
+ if (!two.containsEntry(key, val)) {
+ it.remove();
+ modified = true;
+ keyTypeBagNew = keyTypeBagNew.decrease(key.getType());
+ valTypeBagNew = valTypeBagNew.decrease(val.getType());
+ }
+ }
+
+ if (modified) {
+ return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, tmp.freeze());
+ }
+ return def;
+ } else {
+ return ISet.super.intersect(other);
+ }
+ }
+
+ @Override
+ public ISet subtract(ISet other) {
+ if (other == this) {
+ return EmptySet.EMPTY_SET;
+ }
+ if (other == null) {
+ return this;
+ }
+
+ if (other instanceof PersistentHashIndexedBinaryRelation) {
+ PersistentHashIndexedBinaryRelation that = (PersistentHashIndexedBinaryRelation) other;
+
+ final SetMultimap.Immutable one;
+ final SetMultimap.Immutable two;
+ AbstractTypeBag keyTypeBagNew;
+ AbstractTypeBag valTypeBagNew;
+ final ISet def;
+
+ def = this;
+ one = this.content;
+ keyTypeBagNew = this.keyTypeBag;
+ valTypeBagNew = this.valTypeBag;
+ two = that.content;
+
+ final SetMultimap.Transient tmp = one.asTransient();
+ boolean modified = false;
+
+ for (Map.Entry tuple : two.entrySet()) {
+ final IValue key = tuple.getKey();
+ final IValue val = tuple.getValue();
+
+ if (tmp.__remove(key, val)) {
+ modified = true;
+ keyTypeBagNew = keyTypeBagNew.decrease(key.getType());
+ valTypeBagNew = valTypeBagNew.decrease(val.getType());
+ }
+ }
+
+ if (modified) {
+ return PersistentSetFactory.from(keyTypeBagNew, valTypeBagNew, tmp.freeze());
+ }
+ return def;
+ } else {
+ return ISet.super.subtract(other);
+ }
+ }
+
+ @Override
+ public ISet compose(IRelation otherSetRelation) {
+ if (otherSetRelation.getClass() != this.getClass()) {
+ return IRelation.super.compose(otherSetRelation);
+ }
+
+ // Here we can optimize the compose operation because we have already an index in memory
+ // for both relations
+
+ final PersistentHashIndexedBinaryRelation thatSet =
+ (PersistentHashIndexedBinaryRelation) otherSetRelation.asContainer();
+
+ final SetMultimap.Immutable xy = content;
+ final SetMultimap.Immutable yz = thatSet.content;
+
+ /**
+ * The code below is still sub-optimal because it operates on the logical (rather than the structural) level.
+ *
+ * TODO: nodes should get proper support for stream processing such that the following template can be used:
+ *
+ * // @formatter:off
+ * final Stream> localStream = null;
+ * final Node updatedNode = localStream
+ * .filter((x, y) -> yz.containsKey(y))
+ * .mapValues(y -> yz.get(y))
+ * .collect(toNode());
+ * // @formatter:on
+ */
+ final SetMultimap.Transient xz = xy.asTransient();
+
+ for (IValue x : xy.keySet()) {
+ final Set.Immutable ys = xy.get(x);
+ // TODO: simplify expression with nullable data
+ final Set.Immutable zs = ys.stream()
+ .flatMap(y -> Optional.ofNullable(yz.get(y)).orElseGet(Set.Immutable::of).stream())
+ .collect(CapsuleCollectors.toSet());
+
+ if (zs == null) {
+ xz.__remove(x);
+ } else {
+ // xz.__put(x, zs); // TODO: requires node batch update support
+
+ xz.__remove(x);
+ zs.forEach(z -> xz.__insert(x, z));
+ }
+ }
+
+ final SetMultimap.Immutable