Update printer to match AST changes

Author: mahills

lib/Rascal/RascalPrinter.php

@@ -33,6 +33,8 @@ class RascalPrinter extends BasePrinter
 
  private $currentMethod = "";
 
+ private $currentProperty = "";
+
  private $currentNamespace = "";
 
  private $inAssignExpr = false;
@@ -334,6 +336,11 @@ public function pprintArrayItem(\PhpParser\Node\ArrayItem $node)
  return $fragment;
  }
 
+public function pprintArrayItemExpr(\PhpParser\Node\Expr\ArrayItem $node)
+{ 
+return $this->pprintArrayItem($node);
+}
+
  public function pprintAssignExpr(\PhpParser\Node\Expr\Assign $node)
  {
  $assignExpr = $this->pprint($node->expr);
@@ -731,6 +738,11 @@ public function pprintClosureUse(\PhpParser\Node\ClosureUse $node)
  return $fragment;
  }
 
+ public function pprintClosureUseExpr(\PhpParser\Node\Expr\ClosureUse $node)
+ {
+ return $this->pprintClosureUse($node);
+ }
+
  public function pprintConstFetchExpr(\PhpParser\Node\Expr\ConstFetch $node)
  {
  $fragment = "fetchConst(" . $this->pprint($node->name);
@@ -983,6 +995,8 @@ public function pprintShellExecExpr(\PhpParser\Node\Expr\ShellExec $node)
  $parts[] = $this->pprint($item);
  } elseif ($item instanceof \PhpParser\Node\InterpolatedStringPart) {
  $parts[] = $this->pprint($item);
+ } elseif ($item instanceof \PhpParser\Node\Scalar\EncapsedStringPart) {
+ $parts[] = $this->pprint($item);
  } else {
  $parts[] = "scalar(string(\"" . $this->rascalizeString($item) . "\"))";
  }
@@ -1122,6 +1136,47 @@ public function pprintIdentifier(\PhpParser\Node\Identifier $node)
  return $node->name;
  }
 
+public function pprintPropertyHook(\PhpParser\Node\PropertyHook $node)
+{
+ // TODO: We should add current/prior function tracking here...
+ $name = $this->pprint($node->name);
+
+ // TODO: Are there other modifiers that could apply here?
+ $modifiers = array();
+ if ($node->isFinal())
+ $modifiers[] = "final()";
+
+ $byRef = $node->returnsByRef();
+
+ $params = array();
+ foreach ($node->getParams() as $param)
+ $params[] = $this->pprint($param);
+
+ $body = array();
+ if ($node->body instanceof Expr) {
+ $body[] = $this->pprint($node->body);
+ } elseif(null !== $node->body) {
+ foreach ($node->body as $stmt) {
+ $body[] = $this->pprint($stmt);
+ }
+ }
+
+ $attrs = array();
+ foreach ($node->getAttrGroups() as $attr) {
+ $attrs[] = $this->pprint($attr);
+ }
+
+ if ($node->body instanceof Expr) {
+ $fragment = sprintf("propertyHookExpr(\"%s\",[%s],%s,[%s],%s,[%s]", $name, $modifiers, $byRef, implode(",",$params),$body[0],implode(",",$attrs));
+ } else {
+ $fragment = sprintf("propertyHookStmts(\"%s\",[%s],%s,[%s],[%s],[%s]", $name, $modifiers, $byRef, implode(",",$params),implode(",",$body),implode(",",$attrs));
+ }
+ $fragment .= $this->annotateASTNode($node);
+ $fragment .= ")"; 
+
+ return $fragment;
+}
+
  public function pprintFullyQualifiedName(\PhpParser\Node\Name\FullyQualified $node)
  {
  return "\\" . $this->pprintName($node);
@@ -1149,8 +1204,6 @@ public function pprintNullableType(\PhpParser\Node\NullableType $node)
 
  public function pprintParam(\PhpParser\Node\Param $node)
  {
- // TODO: Add support for property hoooks
-
  $type = $this->formatType($node->type);
 
  $varName = $node->var->name;
@@ -1195,8 +1248,13 @@ public function pprintParam(\PhpParser\Node\Param $node)
  foreach ($node->attrGroups as $attr) {
  $attrs[] = $this->pprint($attr);
  }
+
+ $hooks = array();
+ foreach ($node->hooks as $hook) {
+ $hooks[] = $this->pprint($hook);
+ }
 
- $fragment = sprintf("param(\"%s\",%s,%s,%s,%s,{%s},[%s]", $varName, $default, $byRef, $variadic, $type, $mods, implode(",",$attrs));
+ $fragment = sprintf("param(\"%s\",%s,%s,%s,%s,{%s},[%s]", $varName, $default, $byRef, $variadic, $type, $mods, implode(",",$attrs), implode(",",$hooks));
  $fragment .= $this->annotateASTNode($node);
  $fragment .= ")";
 
@@ -1217,6 +1275,11 @@ public function pprintFloatScalar(\PhpParser\Node\Scalar\Float_ $node)
  return $fragment;
  }
 
+public function pprintDNumberScalar(\PhpParser\Node\Scalar\DNumber $node)
+{
+return $this->pprintFloatScalar($node);
+}
+
  public function pprintInterpolatedStringScalar(\PhpParser\Node\Scalar\InterpolatedString $node)
  {
  $parts = array();
@@ -1225,6 +1288,8 @@ public function pprintInterpolatedStringScalar(\PhpParser\Node\Scalar\Interpolat
  $parts[] = $this->pprint($item);
  } elseif ($item instanceof \PhpParser\Node\InterpolatedStringPart) {
  $parts[] = $this->pprint($item);
+ } elseif ($item instanceof \PhpParser\Node\Scalar\EncapsedStringPart) {
+ $parts[] = $this->pprint($item);
  } else {
  // TODO: This may no longer be reachable because of the addition of
  // the EncapsedStringPart class, verify this...
@@ -1238,6 +1303,11 @@ public function pprintInterpolatedStringScalar(\PhpParser\Node\Scalar\Interpolat
  return $fragment;
  }
 
+public function pprintEncapsedScalar(\PhpParser\Node\Scalar\Encapsed $node)
+{
+return $this->pprintInterpolatedStringScalar($node);
+}
+
  public function pprintInterpolatedStringPart(\PhpParser\Node\InterpolatedStringPart $node)
  {
  $fragment = "string(\"" . $this->rascalizeString($node->value) . "\")";
@@ -1248,6 +1318,11 @@ public function pprintInterpolatedStringPart(\PhpParser\Node\InterpolatedStringP
  return $fragment;
  }
 
+public function pprintEncapsedStringPartScalar(\PhpParser\Node\Scalar\EncapsedStringPart $node)
+{
+return $this->pprintInterpolatedStringPart($node);
+}
+
  public function pprintIntScalar(\PhpParser\Node\Scalar\Int_ $node)
  {
  $fragment = "integer(" . sprintf('%d', $node->value) . ")";
@@ -1258,6 +1333,11 @@ public function pprintIntScalar(\PhpParser\Node\Scalar\Int_ $node)
  return $fragment;
  }
 
+public function pprintLNumberScalar(\PhpParser\Node\Scalar\LNumber $node)
+{
+return $this->pprintIntScalar($node);
+}
+
  public function pprintClassMagicConstScalar(\PhpParser\Node\Scalar\MagicConst\Class_ $node)
  {
  // If we are inside a trait and find __CLASS__, we have no clue what it should
@@ -1303,6 +1383,12 @@ public function pprintMethodMagicConstScalar(\PhpParser\Node\Scalar\MagicConst\M
  $this->currentMethod ? $this->currentClass . "::" . $this->currentMethod : "");
  }
 
+public function pprintPropertyMagicConstScalar(\PhpParser\Node\Scalar\MagicConst\Property $node)
+{
+ return $this->handleMagicConstExpression($node, "propertyConstant",
+ $this->currentProperty ? $this->currentClass . "::" . $this->currentProperty : "");
+}
+
  public function pprintNamespaceMagicConstScalar(\PhpParser\Node\Scalar\MagicConst\Namespace_ $node)
  {
  return $this->handleMagicConstExpression($node, "namespaceConstant", $this->currentNamespace);
@@ -1551,7 +1637,12 @@ public function pprintConstStmt(\PhpParser\Node\Stmt\Const_ $node)
  foreach ($node->consts as $const)
  $consts[] = $this->pprint($const);
 
- $fragment = "const([" . implode(",", $consts) . "]";
+ $attrs = array();
+ foreach ($node->attrGroups as $attr) {
+ $attrs[] = $this->pprint($attr);
+ }
+
+ $fragment = "const([" . implode(",", $consts) . ",[" . implode(",", $attrs) . "]";
  $fragment .= $this->annotateASTNode($node);
  $fragment .= ")";
 
@@ -1602,6 +1693,11 @@ public function pprintDeclareItem(\PhpParser\Node\DeclareItem $node)
  return $fragment;
  }
 
+ public function pprintDeclareDeclareStmt(\PhpParser\Node\Stmt\DeclareDeclare $node)
+ {
+ return $this->pprintDeclareItem($node);
+ }
+
  public function pprintDoStmt(\PhpParser\Node\Stmt\Do_ $node)
  {
  $stmts = array();
@@ -1999,8 +2095,13 @@ public function pprintPropertyStmt(\PhpParser\Node\Stmt\Property $node)
  $attrs[] = $this->pprint($attr);
  }
 
+ $hooks = array();
+ foreach ($node->hooks as $hook) {
+ $hooks[] = $this->pprint($hook);
+ }
+
  $fragment = "property({" . implode(",", $modifiers) . "},[" . implode(",", $props) . "]," . $this->formatType($node->type);
- $fragment .= ",[" . implode(",",$attrs) . "]";
+ $fragment .= ",[" . implode(",",$attrs) . "],[" . implode(",",$hooks) ."]";
  $fragment .= $this->annotateASTNode($node);
  $fragment .= ")";
 
@@ -2022,6 +2123,11 @@ public function pprintPropertyItem(\PhpParser\Node\PropertyItem $node)
  return $fragment;
  }
 
+ public function pprintPropertyPropertyStmt(\PhpParser\Node\Stmt\PropertyProperty $node)
+ {
+ return $this->pprintPropertyItem($node);
+ }
+
  public function pprintReturnStmt(\PhpParser\Node\Stmt\Return_ $node)
  {
  if (null !== $node->expr)
@@ -2048,6 +2154,19 @@ public function pprintStaticStmt(\PhpParser\Node\Stmt\Static_ $node)
  return $fragment;
  }
 
+public function pprintBlockStmt(\PhpParser\Node\Stmt\Block $node)
+{
+ $statements = array();
+ foreach ($node->stmts as $stmt)
+ $statements[] = $this->pprint($stmt);
+
+ $fragment = "block([" . implode(",", $statements) . "]";
+ $fragment .= $this->annotateASTNode($node);
+ $fragment .= ")";
+
+ return $fragment;
+}
+
  public function pprintStaticVar(\PhpParser\Node\StaticVar $node)
  {
  $default = "noExpr()";
@@ -2065,6 +2184,11 @@ public function pprintStaticVar(\PhpParser\Node\StaticVar $node)
  return $fragment;
  }
 
+ public function pprintStaticVarStmt(\PhpParser\Node\Stmt\StaticVar $node)
+ {
+ return $this->pprintStaticVar($node);
+ }
+
  public function pprintSwitchStmt(\PhpParser\Node\Stmt\Switch_ $node)
  {
  $cases = array();
@@ -2287,6 +2411,11 @@ public function pprintUseItem(\PhpParser\Node\UseItem $node)
  return $fragment;
  }
 
+ public function pprintUseUseStmt(\PhpParser\Node\Stmt\UseUse $node)
+ {
+ return $this->pprintUseItem($node);
+ }
+
  public function pprintWhileStmt(\PhpParser\Node\Stmt\While_ $node)
  {
  $stmts = array();