allow assigning components to a value, by checking the components type

Author: psybers

src/java/boa/types/BoaArray.java

@@ -44,10 +44,14 @@ public BoaArray(final BoaType boaType) {
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
-		// if that is a function, check its return type
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		if (that instanceof BoaTuple) {
 			for (BoaType t : ((BoaTuple) that).getTypes())
 				if (!this.type.assigns(t))

src/java/boa/types/BoaMap.java

@@ -51,10 +51,14 @@ public BoaMap(final BoaType valueType, final BoaType indexType) {
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
-		// if that is a function, check the return value
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		// otherwise, if that is not a map, forget it
 		if (!(that instanceof BoaMap))
 			return false;

src/java/boa/types/BoaProtoList.java

@@ -47,10 +47,14 @@ public BoaProtoList(final BoaType boaType) {
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
-		// if that is a function, check its return type
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		if (that instanceof BoaTuple) {
 			for (BoaType t : ((BoaTuple) that).getTypes())
 				if (!this.type.assigns(t))

src/java/boa/types/BoaScalar.java

@@ -29,9 +29,9 @@ public boolean assigns(final BoaType that) {
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
-		// otherwise, if it's not a scalar, forget it
-		if (!(that instanceof BoaScalar))
-			return false;
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
 
 		// check that the classes match
 		return this.getClass().equals(that.getClass());

src/java/boa/types/BoaSet.java

@@ -45,10 +45,14 @@ public BoaSet(final BoaType boaType) {
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
-		// if that is a function, check the return value
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		// otherwise, if that is not a set, forget it
 		if (!(that instanceof BoaSet))
 			return false;

src/java/boa/types/BoaStack.java

@@ -45,10 +45,14 @@ public BoaStack(final BoaType boaType) {
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
-		// if that is a function, check the return value
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		// otherwise, if that is not a stack, forget it
 		if (!(that instanceof BoaStack))
 			return false;

src/java/boa/types/BoaTuple.java

@@ -57,9 +57,14 @@ protected BoaTuple(final List<BoaType> members, final Map<String, Integer> names
 	/** {@inheritDoc} */
 	@Override
 	public boolean assigns(final BoaType that) {
+		// if that is a function, check the return type
 		if (that instanceof BoaFunction)
 			return this.assigns(((BoaFunction) that).getType());
 
+		// if that is a component, check the type
+		if (that instanceof BoaName)
+			return this.assigns(((BoaName) that).getType());
+
 		if (that instanceof BoaArray) {
 			BoaType type = ((BoaArray) that).getType();
 			if (type instanceof BoaName)

test/typecheck/component-names.boa

@@ -0,0 +1,11 @@
+o1: output top(5)[i1: int][i2: int] of v: int weight s: float;
+o2: output top(5)[i1: int][i2: int] of v: int weight s: float;
+
+s: set of i: int;
+st: stack of i: int;
+arr: array of i: int;
+m: map[k: string] of v: float;
+
+v1: map[foo: string] of map[foo1: Expression] of set of foo2: string; 
+v2: map[foo: string] of map[foo1: Expression] of set of foo2: string; 
+