Updated to match AST datatype changes

mahills · mahills · commit bded25a9055a · 2025-06-02T12:00:32.000-04:00
diff --git a/src/main/rascal/lang/php/analysis/callgraph/SimpleCG.rsc b/src/main/rascal/lang/php/analysis/callgraph/SimpleCG.rsc
@@ -13,7 +13,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 module lang::php::analysis::callgraph::SimpleCG
 
 import lang::php::ast::AbstractSyntax;
-import lang::php::analysis::NamePaths;
 import lang::php::analysis::signatures::Summaries;
 import lang::php::analysis::signatures::Signatures;
 import lang::php::ast::System;
diff --git a/src/main/rascal/lang/php/analysis/cfg/BasicBlocks.rsc b/src/main/rascal/lang/php/analysis/cfg/BasicBlocks.rsc
@@ -15,7 +15,6 @@ module lang::php::analysis::cfg::BasicBlocks
 
 import lang::php::analysis::cfg::CFG;
 import lang::php::analysis::cfg::FlowEdge;
-import lang::php::analysis::cfg::Label;
 import lang::php::analysis::NamePaths;
 
 import Relation;
diff --git a/src/main/rascal/lang/php/analysis/cfg/BuildCFG.rsc b/src/main/rascal/lang/php/analysis/cfg/BuildCFG.rsc
@@ -221,7 +221,7 @@ private tuple[CFG methodCFG, LabelState lstate] createMethodCFG(loc np, ClassIte
 	// Add initial nodes to represent initializing parameters with default values,
 	// plus add flow edges between these default initializers
 	list[CFGNode] paramNodes = [ ];
-	for (param(paramName,paramDefault,byRef,_,_,_,_) <- m.params) {
+	for (param(paramName,paramDefault,byRef,_,_,_,_,_) <- m.params) {
 		newLabel = incLabel();
 		newNode = (someExpr(e) := paramDefault) 
 			? actualNotProvided(paramName, e, byRef, newLabel)[lab=newLabel] 
@@ -309,7 +309,7 @@ private tuple[CFG functionCFG, LabelState lstate] createFunctionCFG(loc np, Stmt
 	// Add initial nodes to represent initializing parameters with default values,
 	// plus add flow edges between these default initializers
 	list[CFGNode] paramNodes = [ ];
-	for (param(paramName,paramDefault,byRef,_,_,_,_) <- f.params) {
+	for (param(paramName,paramDefault,byRef,_,_,_,_,_) <- f.params) {
 		newLabel = incLabel();
 		newNode = (someExpr(e) := paramDefault) 
 			? actualNotProvided(paramName, e, byRef, newLabel)[lab=newLabel] 
@@ -376,7 +376,7 @@ public set[Lab] init(Stmt s, LabelState lstate) {
 
 		// Given a list of constants, the first thing that occurs is the expression that is
 		// assigned to the first constant in the list.
-		case const(list[Const] consts) : {
+		case const(list[Const] consts, _) : {
 			return init(head(consts).constValue, lstate);
 		}
 
@@ -668,7 +668,7 @@ private set[Lab] final(Stmt s, LabelState lstate) {
 		}
 		
 		// We always have at least one const; the final const provides the labels.
-		case const(list[Const] consts) : {
+		case const(list[Const] consts, _) : {
 			return final(last(consts).constValue, lstate);
 		}
 
@@ -968,7 +968,7 @@ public tuple[FlowEdges,LabelState] internalFlow(Stmt s, LabelState lstate) {
 		// For consts, we add the edges internal to each const expression, plus we link up
 		// the expressions. The final labels are already the final labels for the last
 		// const initializer expression, so we don't need to further link those up here.
-		case const(list[Const] consts) : {
+		case const(list[Const] consts, _) : {
 			vals = [ c.constValue | c <- consts ];
 			for (v <- vals) < edges, lstate > = addExpEdges(edges, lstate, v);
 			< edges, lstate > = addExpSeqEdges(edges, lstate, vals);
diff --git a/src/main/rascal/lang/php/analysis/cfg/Label.rsc b/src/main/rascal/lang/php/analysis/cfg/Label.rsc
@@ -13,8 +13,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 @contributor{Mark Hills - Mark.Hills@cwi.nl (CWI)}
 module lang::php::analysis::cfg::Label
 
-import lang::php::ast::AbstractSyntax;
-
 @doc{Labels are added to expressions and statements to give us a 
      shorthand to refer to the various statements, expressions, and
      sub-statements/sub-expressions in the code.}
diff --git a/src/main/rascal/lang/php/analysis/composer/Composer.rsc b/src/main/rascal/lang/php/analysis/composer/Composer.rsc
@@ -233,10 +233,10 @@ public Composer loadComposerFile(loc l, bool justPublishedPackages = false) {
     if ("authors" in js) {
         if (list[node] ats := js["authors"]) {
             for (atr <- ats) {
-                authName = if(atr has name, str s := atr.name) just(s); else nothing();
-                authEmail = if(atr has email, str s := atr.email) just(s); else nothing();
-                authHomepage = if (atr has homepage, str s := atr.homepage) just(s); else nothing();
-                authRole = if (atr has role, str s := atr.role) just(s); else nothing();
+                authName = (atr has name && str s := atr.name) ? just(s) : nothing();
+                authEmail = (atr has email && str s := atr.email) ? just(s) : nothing();
+                authHomepage = (atr has homepage && str s := atr.homepage) ? just(s) : nothing();
+                authRole = (atr has role && str s := atr.role) ? just(s) : nothing();
                 authors = authors + author(authName, authEmail, authHomepage, authRole);
             }
         } else {
diff --git a/src/main/rascal/lang/php/analysis/composer/ComposerAnalysis.rsc b/src/main/rascal/lang/php/analysis/composer/ComposerAnalysis.rsc
@@ -176,7 +176,7 @@ public void dependencyCounts(loc l, rel[str owner, str repo, Composer cinfo] com
 
     map[str,int] dependencyCounts = ( );
 
-    for (<owner, repo, cinfo> <- composerInfo, cinfo is composer) {
+    for (<_, _, cinfo> <- composerInfo, cinfo is composer) {
         for ( < vendorName, projectName, _ > <- cinfo.packageDependencies[dependencyType] ) {
             dependencyName = "<vendorName>/<projectName>";
             if (dependencyName in dependencyCounts) {
@@ -221,7 +221,7 @@ public lrel[str constraintType, PackageVersionConstraint constraint] fetchConstr
 
     // Second, fill the list with all the constraints. We track the dependency type too, but we
     // skip suggest dependencies since these are just textual, there are no constraints.
-    for (< owner, repo, cinfo > <- composerInfo, cinfo is composer) {
+    for (< _, _, cinfo > <- composerInfo, cinfo is composer) {
         for ( < dependencyType, _, _, constraint > <- cinfo.packageDependencies, dependencyType != "suggest") {
             constraintList = constraintList + < dependencyType, constraint >;
         }
diff --git a/src/main/rascal/lang/php/analysis/composer/VersionSyntax.rsc b/src/main/rascal/lang/php/analysis/composer/VersionSyntax.rsc
@@ -127,7 +127,7 @@ private PackageVersionConstraint parseWildcardConstraint(WildcardConstraint wc)
 public PackageVersionConstraint parseConstraint(str constraintText) {
     try {
         return parseConstraint(parse(#VersionConstraint, constraintText));
-    } catch ParseError(loc l): {
+    } catch ParseError(loc _): {
         return rawConstraint(constraintText);
     }
 }
diff --git a/src/main/rascal/lang/php/analysis/evaluators/DefinedConstants.rsc b/src/main/rascal/lang/php/analysis/evaluators/DefinedConstants.rsc
@@ -107,9 +107,9 @@ public set[ConstItem] getScriptConstUses(Script scr) {
 }
 
 public set[ConstItemExp] getScriptConstDefs(Script scr) =
-	{ classConst(cln, cn, ce) | /class(cln,_,_,_,cis,_) := scr, classConst(consts,_,_) <- cis, const(cn,ce) <- consts } + // TODO: Do we need to worry about const modifiers?
+	{ classConst(cln, cn, ce) | /class(cln,_,_,_,cis,_) := scr, ClassItem::classConst(consts,_,_,_) <- cis, const(cn,ce) <- consts } + // TODO: Do we need to worry about const modifiers?
 	{ normalConst(cn, ce) | /call(name(name("define")),[actualParameter(scalar(string(cn)),false,false,_),actualParameter(ce,false,false,_)]) := scr } +
-	{ normalConst(cn, ce) | /Stmt::const(cl) := scr, Const::const(cn,ce) <- cl };
+	{ normalConst(cn, ce) | /Stmt::const(cl, _) := scr, Const::const(cn,ce) <- cl };
 
 public set[ConstItemExp] getSignatureConsts(Signature sig) {
 	set[ConstItemExp] res = { };
diff --git a/src/main/rascal/lang/php/analysis/signatures/Signatures.rsc b/src/main/rascal/lang/php/analysis/signatures/Signatures.rsc
@@ -56,7 +56,7 @@ public Signature getFileSignature(loc fileloc, Script scr, bool buildInfo=false)
 				}
 			}
 		}
-		for(classConst(consts,_,_) <- cis, const(cn,ce) <- consts) {
+		for(classConst(consts,_,_,_) <- cis, const(cn,ce) <- consts) {
 			items += classConstSig(classConstPath(cln, cn), ce);
 		}
 	}
@@ -92,7 +92,7 @@ public Signature getFileSignature(loc fileloc, Script scr, bool buildInfo=false)
 
 public Signature getScriptConstants(loc fileloc, Script scr) {
 	set[SignatureItem] items = 
-		{ classConstSig(classConstPath(cln, cn), ce) | /class(cln,_,_,_,cis,_) := scr, classConst(consts,_,_) <- cis, const(cn,ce) <- consts } +
+		{ classConstSig(classConstPath(cln, cn), ce) | /class(cln,_,_,_,cis,_) := scr, classConst(consts,_,_,_) <- cis, const(cn,ce) <- consts } +
 		{ constSig(constPath(cn),e) | /call(name(name("define")),[actualParameter(scalar(string(cn)),false,false,_),actualParameter(e,false,false,_)]) := scr };
 	return fileSignature(fileloc, items);
 }
diff --git a/src/main/rascal/lang/php/ast/NormalizeAST.rsc b/src/main/rascal/lang/php/ast/NormalizeAST.rsc
@@ -260,8 +260,8 @@ public Script addPublicModifierWhenNotProvided(Script s) {
 	
 	solve(s) {
 		s = visit(s) {
-			case origNode:property(set[Modifier] mfs, prop, ptype, pattrs) => 
-				setAnnotations( property(mfs + publicModifier, prop, ptype, pattrs), getAnnotations(origNode))
+			case origNode:property(set[Modifier] mfs, prop, ptype, pattrs, phooks) => 
+				setAnnotations( property(mfs + publicModifier, prop, ptype, pattrs, phooks), getAnnotations(origNode))
 			when \public() notin mfs && \private() notin mfs && \protected() notin mfs
 				
 			case origNode:method(str mname, set[Modifier] mfs, byRef, params, body, rtype, mattrs) => 
diff --git a/src/main/rascal/lang/php/pp/PrettyPrinter.rsc b/src/main/rascal/lang/php/pp/PrettyPrinter.rsc
@@ -280,21 +280,21 @@ public default bool ppOnRight(Op x) = isUnary(x) && !ppOnLeft(x);
 //						  bool byRef,
 //						  bool isVariadic, 
 //						  PHPType paramType);
-public str pp(param(str pn, noExpr(), true, true, PHPType returnType, mods, _)) 
+public str pp(param(str pn, noExpr(), true, true, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>&$<pn>...";
-public str pp(param(str pn, noExpr(), true, false, PHPType returnType, mods, _)) 
+public str pp(param(str pn, noExpr(), true, false, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>&$<pn>";
-public str pp(param(str pn, noExpr(), false, true, PHPType returnType, mods, _)) 
+public str pp(param(str pn, noExpr(), false, true, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>$<pn>...";
-public str pp(param(str pn, noExpr(), false, false, PHPType returnType, mods, _)) 
+public str pp(param(str pn, noExpr(), false, false, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>$<pn>";
-public str pp(param(str pn, someExpr(Expr e), true, true, PHPType returnType, mods, _)) 
+public str pp(param(str pn, someExpr(Expr e), true, true, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>&$<pn>... = <pp(e)>";
-public str pp(param(str pn, someExpr(Expr e), true, false, PHPType returnType, mods, _)) 
+public str pp(param(str pn, someExpr(Expr e), true, false, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>&$<pn> = <pp(e)>";
-public str pp(param(str pn, someExpr(Expr e), false, true, PHPType returnType, mods, _)) 
+public str pp(param(str pn, someExpr(Expr e), false, true, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>$<pn>... = <pp(e)>";
-public str pp(param(str pn, someExpr(Expr e), false, false, PHPType returnType, mods, _)) 
+public str pp(param(str pn, someExpr(Expr e), false, false, PHPType returnType, mods, _, _)) 
 	= "<padIfNotEmpty(intercalate(" ",[pp(m)|m<-mods]))><padIfNotEmpty(pp(returnType))>$<pn> = <pp(e)>";
 
 public str padIfNotEmpty(str s) = "<s> " when size(s) != 0;
@@ -343,7 +343,7 @@ public str pp(\break(noExpr())) = "break;";
 public str pp(classDef(ClassDef classDef)) = pp(classDef);
 
 //	| const(list[Const] consts)
-public str pp(Stmt::const(list[Const] consts)) = "const <intercalate(",",[pp(c)|c<-consts])>;";
+public str pp(Stmt::const(list[Const] consts, list[AttributeGroup] attributeGroups)) = "const <intercalate(",",[pp(c)|c<-consts])>;";
 
 //	| \continue(OptionExpr continueExpr)
 public str pp(\continue(someExpr(Expr continueExpr))) = "continue <pp(continueExpr)>;";
@@ -564,12 +564,12 @@ public str pp(Use::use(Name importName, noName(), UseType useType)) = "<pp(impor
 
 //public data ClassItem 
 //	= property(set[Modifier] modifiers, list[Property] prop)
-public str pp(ClassItem::property(set[Modifier] modifiers, list[Property] prop, PHPType ptype, _)) =
+public str pp(ClassItem::property(set[Modifier] modifiers, list[Property] prop, PHPType ptype, _, _)) =
 	"<for(p <- prop) {><intercalate(" ",[pp(m)|m<-modifiers])> <pp(ptype)> <pp(p)>;
 	'<}>";
 
 //	| classConst(list[Const] consts)
-public str pp(classConst(list[Const] consts, set[Modifier] modifiers, _)) = "const <intercalate(",",[pp(c)|c<-consts])>;";
+public str pp(classConst(list[Const] consts, set[Modifier] modifiers, _, _)) = "const <intercalate(",",[pp(c)|c<-consts])>;";
 
 //	| method(str name, set[Modifier] modifiers, bool byRef, list[Param] params, list[Stmt] body)
 // TODO classes of interfaces have no body
diff --git a/src/main/rascal/lang/php/stats/OOMetrics.rsc b/src/main/rascal/lang/php/stats/OOMetrics.rsc
@@ -21,8 +21,8 @@ import lang::php::ast::System;
 public list[ClassDef] getClasses(System product) = [ c | /ClassDef c := product.files ];
 public list[InterfaceDef] getInterfaces(System product) = [ i | /InterfaceDef i := product.files ];
 public list[ClassItem] getMethods(System product) = [ m |  /m:method(_, _, _, _, _, _, _) := product.files ];
-public list[Property] getProperties(System product) = [ p | /property(_, list[Property] prop, _, _) := product.files, p <- prop ];
-public list[ClassItem] getPropertyDecls(System product) = [ p | /ClassItem p:property(_, _, _, _) := product.files ];
+public list[Property] getProperties(System product) = [ p | /property(_, list[Property] prop, _, _, _) := product.files, p <- prop ];
+public list[ClassItem] getPropertyDecls(System product) = [ p | /ClassItem p:property(_, _, _, _, _) := product.files ];
 public list[Stmt] getFunctions(System product) = [ f | /f:function(_,_,_,_,_,_) := product.files ];
 
 public int classesCount(System product) {
diff --git a/src/main/rascal/lang/php/stats/Stats.rsc b/src/main/rascal/lang/php/stats/Stats.rsc
@@ -351,7 +351,7 @@ public list[str] castTypeOrder() = [ "int", "bool", "float", "string", "array",
 
 public str getStmtKey(\break(_)) = "break";
 public str getStmtKey(classDef(_)) = "class def";
-public str getStmtKey(Stmt::const(_)) = "const";
+public str getStmtKey(Stmt::const(_,_)) = "const";
 public str getStmtKey(\continue(_)) = "continue";
 public str getStmtKey(declare(_,_)) = "declare";
 public str getStmtKey(do(_,_)) = "do";
@@ -384,12 +384,13 @@ public list[str] stmtKeyOrder() = [ "break", "class def", "const", "continue", "
 								    "namespace", "return", "static", "switch", "throw",
 								    "try/catch", "unset", "use", "while" ];
 								    
-public str getClassItemKey(ClassItem::property(set[Modifier] modifiers, list[Property] prop, PHPType ptype, _)) = "propertyDef";
-public str getClassItemKey(ClassItem::classConst(list[Const] consts, set[Modifier] modifiers, _)) = "classConstDef";
-public str getClassItemKey(ClassItem::method(str name, set[Modifier] modifiers, bool byRef, list[Param] params, list[Stmt] body, PHPType returnType, _)) = "methodDef";
-public str getClassItemKey(ClassItem::traitUse(list[Name] traits, list[Adaptation] adaptations)) = "traitUse";
+public str getClassItemKey(ClassItem::property(set[Modifier] _, list[Property] _, PHPType _, list[AttributeGroup] _, list[PropertyHook] _)) = "propertyDef";
+public str getClassItemKey(ClassItem::classConst(list[Const] _, set[Modifier] _, list[AttributeGroup] _, PHPType _)) = "classConstDef";
+public str getClassItemKey(ClassItem::method(str name, set[Modifier] _, bool _, list[Param] _, list[Stmt] _, PHPType _, list[AttributeGroup] _)) = "methodDef";
+public str getClassItemKey(ClassItem::traitUse(list[Name] _, list[Adaptation] _)) = "traitUse";
+public str getClassItemKey(ClassItem::enumCase(str _, OptionExpr _, list[AttributeGroup] _)) = "enumCaseDef";
 								    
-public list[str] classItemKeyOrder() = ["propertyDef","classConstDef","methodDef","traitUse"];
+public list[str] classItemKeyOrder() = ["propertyDef","classConstDef","methodDef","traitUse","enumCaseDef"];
 
 public list[str] featureOrder() = [ "class consts with variable class name",
 									"assignments into variable-variables",

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private PackageVersionConstraint parseWildcardConstraint(WildcardConstraint wc)`
`127`	`127`	`public PackageVersionConstraint parseConstraint(str constraintText) {`
`128`	`128`	`try {`
`129`	`129`	`return parseConstraint(parse(#VersionConstraint, constraintText));`
`130`		`- } catch ParseError(loc l): {`
	`130`	`+ } catch ParseError(loc _): {`
`131`	`131`	`return rawConstraint(constraintText);`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Signature getFileSignature(loc fileloc, Script scr, bool buildInfo=false)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- for(classConst(consts,_,_) <- cis, const(cn,ce) <- consts) {`
	`59`	`+ for(classConst(consts,_,_,_) <- cis, const(cn,ce) <- consts) {`
`60`	`60`	`items += classConstSig(classConstPath(cln, cn), ce);`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -92,7 +92,7 @@ public Signature getFileSignature(loc fileloc, Script scr, bool buildInfo=false)`
`92`	`92`
`93`	`93`	`public Signature getScriptConstants(loc fileloc, Script scr) {`
`94`	`94`	`set[SignatureItem] items =`
`95`		`- { classConstSig(classConstPath(cln, cn), ce) \| /class(cln,_,_,_,cis,_) := scr, classConst(consts,_,_) <- cis, const(cn,ce) <- consts } +`
	`95`	`+ { classConstSig(classConstPath(cln, cn), ce) \| /class(cln,_,_,_,cis,_) := scr, classConst(consts,_,_,_) <- cis, const(cn,ce) <- consts } +`
`96`	`96`	`{ constSig(constPath(cn),e) \| /call(name(name("define")),[actualParameter(scalar(string(cn)),false,false,_),actualParameter(e,false,false,_)]) := scr };`
`97`	`97`	`return fileSignature(fileloc, items);`
`98`	`98`	`}`