more updates to support dataflow with structs

Author: rmanohar

act/check.cc

@@ -132,6 +132,7 @@ static InstType *_act_get_var_type (Scope *s, ActId *id, ActId **retid,
  }
 
  bool subchan_conv = false;
+ ActId *orig_id = id;
 
  if (id->Rest ()) {
  while (id->Rest()) {
@@ -140,6 +141,14 @@ static InstType *_act_get_var_type (Scope *s, ActId *id, ActId **retid,
 subchan_conv = true;
  }
  u = dynamic_cast<UserDef *>(it->BaseType ());
+ if (!u && !subchan) {
+char *tmpbuf;
+MALLOC (tmpbuf, char, 10240);
+orig_id->sPrint (tmpbuf, 10240);
+typecheck_err ("Identifier `%s' has an illegal use of `.' in this context.", tmpbuf);
+FREE (tmpbuf);
+return NULL;
+ }
  Assert (u, "This should have been caught during parsing!");
  id = id->Rest();
  it = u->Lookup (id);
@@ -257,6 +266,9 @@ int act_type_var_gen (Scope *s, ActId *id, InstType **xit, bool subchan)
  int is_strict;
 
  it = _act_get_var_type (s, id, &id, &is_strict, subchan);
+ if (!it) {
+ return T_ERR;
+ }
 
  if (!it->arrayInfo() && id->arrayInfo()) {
  char *tmpbuf;
@@ -299,7 +311,8 @@ static InstType *_act_special_expr_insttype (Scope *s, Expr *e, int *islocal,
 
  if (e->type == E_VAR) {
  /* special case #1 */
- it = act_actual_insttype (s, (ActId *)e->u.e.l, islocal);
+ it = act_actual_insttype (s, (ActId *)e->u.e.l, islocal,
+ only_chan == 0 ? false : true);
  return it;
  }
  else if (e->type == E_FUNCTION) {
@@ -349,7 +362,8 @@ static InstType *_act_special_expr_insttype (Scope *s, Expr *e, int *islocal,
  Assert (e->u.e.r->type == E_VAR, "What?");
  it = act_actual_insttype (u->CurScope(),
  (ActId *) e->u.e.r->u.e.l,
- islocal);
+ islocal,
+ only_chan == 0 ? false : true);
  return it;
  }
  else if (e->type == E_PSTRUCT) {
@@ -1274,6 +1288,7 @@ int act_type_expr (Scope *s, Expr *e, int *width, int only_chan)
  ActId *tmp, *theid;
  theid = (ActId *) e->u.e.l;
  InstType *it = _act_get_var_type (s, theid, &tmp, NULL, true);
+ Assert (it, "This should not happen");
 
  if (it->getDir() == Type::OUT) {
  InstType *it2 = s->FullLookup (theid->getName());
@@ -1510,7 +1525,7 @@ int act_type_expr (Scope *s, Expr *e, int *width, int only_chan)
  Returns the insttype for the ID. 
  If islocal != NULL, set to 1 if this is a local id within the scope
 */
-InstType *act_actual_insttype (Scope *s, ActId *id, int *islocal)
+InstType *act_actual_insttype (Scope *s, ActId *id, int *islocal, bool subchan)
 {
  InstType *it;
 
@@ -1572,6 +1587,10 @@ InstType *act_actual_insttype (Scope *s, ActId *id, int *islocal)
  }
  UserDef *u;
  u = dynamic_cast<UserDef *>(it->BaseType ());
+ if (!u && subchan && TypeFactory::isChanType (it)) {
+u = dynamic_cast<UserDef *>
+ (TypeFactory::getChanDataType (it)->BaseType());
+ }
  Assert (u, "This should have been caught during parsing!");
 
  /* HERE: APPLY MAP! */
@@ -2166,7 +2185,7 @@ int act_type_conn (Scope *s, ActId *id, AExpr *rae)
  */
 
  int lhslocal;
- InstType *lhs = act_actual_insttype (s, id, &lhslocal);
+ InstType *lhs = act_actual_insttype (s, id, &lhslocal, false);
 
  if (!lhs) return T_ERR;
 

act/lang.m4

@@ -3165,6 +3165,9 @@ w_chan_int_expr "->" [ "[" wpint_expr [ "," wpint_expr ] "]" ] expr_id
  if (_act_id_is_true_false ($4)) {
  $E("Dataflow RHS can't be true/false!");
  }
+ if (_act_id_is_enum_const ($0->os, $0->curns, $4)) {
+ $E("Can't use an enumeration constant in this context!");
+ }
  InstType *it;
  if (act_type_var ($0->scope, $4, &it) != T_CHAN) {
  $e("Identifier on the RHS of a dataflow expression must be of channel type");
@@ -3456,6 +3459,9 @@ expr_id_or_star[ActId *]: expr_id
  if (_act_id_is_true_false ($1)) {
  $E("Can't use true/false in this context!");
  }
+ if (_act_id_is_enum_const ($0->os, $0->curns, $1)) {
+ $E("Can't use an enumeration constant in this context!");
+ }
  return $1;
 }}
 | "*"

act/scope.cc

@@ -1255,7 +1255,7 @@ void Scope::BindParam (ActId *id, AExpr *ae)
  AExprstep *aes = NULL;
 
  if (subrange_info) {
- actual = act_actual_insttype (this, id, NULL);
+ actual = act_actual_insttype (this, id, NULL, false);
  }
  else {
  actual = vx->t;

act/test/lang/139.act

@@ -0,0 +1,13 @@
+deftype rec (int a, b) { }
+
+defproc test()
+{
+ chan(rec) a;
+ chan(int) x;
+
+ dataflow {
+ x -> a.a
+ }
+}
+
+test t;

act/test/lang/140.act

@@ -0,0 +1,13 @@
+deftype rec (int a, b) { }
+
+defproc test()
+{
+ chan(rec) a;
+ chan(int) x;
+
+ dataflow {
+ a.a + a.b -> x
+ }
+}
+
+test t;

act/test/lang/runs/139.act.stderr

@@ -0,0 +1,3 @@
+ERROR: File `139.act', line 9, col 6
+Identifier on the RHS of a dataflow expression must be of channel type
+ ID: a.a

act/test/lang/runs/139.act.stdout

@@ -237,9 +237,10 @@ InstType *act_expr_insttype (Scope *s, Expr *e, int *islocal, int only_chan);
  * @param id is the identifier
  * @param islocal is used to return 1 if the identifier is only
  * accessible within the local scope specified, 0 otherwise
+ * @param subchan has the same meaning as act_type_var_gen
  * @return the type of the identifier (NULL if not found)
  */
-InstType *act_actual_insttype (Scope *s, ActId *id, int *islocal);
+InstType *act_actual_insttype (Scope *s, ActId *id, int *islocal, bool subchan);
 
 /**
  * Used to record the line, column, and file for error reporting