Rename constCI to classConst

Author: mahills

src/main/rascal/lang/php/analysis/evaluators/DefinedConstants.rsc

@@ -107,7 +107,7 @@ public set[ConstItem] getScriptConstUses(Script scr) {
 }
 
 public set[ConstItemExp] getScriptConstDefs(Script scr) =
-	{ classConst(cln, cn, ce) | /class(cln,_,_,_,cis,_) := scr, constCI(consts,_,_) <- cis, const(cn,ce) <- consts } + // TODO: Do we need to worry about const modifiers?
+	{ classConst(cln, cn, ce) | /class(cln,_,_,_,cis,_) := scr, 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 };
 

src/main/rascal/lang/php/analysis/signatures/Signatures.rsc

@@ -56,7 +56,7 @@ public Signature getFileSignature(loc fileloc, Script scr, bool buildInfo=false)
 				}
 			}
 		}
-		for(constCI(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, constCI(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);
 }

src/main/rascal/lang/php/ast/AbstractSyntax.rsc

@@ -239,7 +239,7 @@ public data Use(loc at=|unknown:///|, loc decl=|unknown:///|, str id="", loc sco
 
 public data ClassItem(loc at=|unknown:///|, loc decl=|unknown:///|, str id="", loc scope=|unknown:///|, str phpdoc="")
 	= property(set[Modifier] modifiers, list[Property] prop, PHPType propType, list[AttributeGroup] attributeGroups)
-	| constCI(list[Const] consts, set[Modifier] modifiers, list[AttributeGroup] attributeGroups)
+	| classConst(list[Const] consts, set[Modifier] modifiers, list[AttributeGroup] attributeGroups)
 	| method(str name, set[Modifier] modifiers, bool byRef, list[Param] params, list[Stmt] body, PHPType returnType, list[AttributeGroup] attributeGroups)
 	| traitUse(list[Name] traits, list[Adaptation] adaptations)
 	| enumCase(str caseName, OptionExpr caseExpr, list[AttributeGroup] attributeGroups)

src/main/rascal/lang/php/pp/PrettyPrinter.rsc

@@ -568,8 +568,8 @@ public str pp(ClassItem::property(set[Modifier] modifiers, list[Property] prop,
 	"<for(p <- prop) {><intercalate(" ",[pp(m)|m<-modifiers])> <pp(ptype)> <pp(p)>;
 	'<}>";
 
-//	| constCI(list[Const] consts)
-public str pp(constCI(list[Const] consts, set[Modifier] modifiers, _)) = "const <intercalate(",",[pp(c)|c<-consts])>;";
+//	| classConst(list[Const] 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

src/main/rascal/lang/php/stats/Stats.rsc

@@ -385,7 +385,7 @@ public list[str] stmtKeyOrder() = [ "break", "class def", "const", "continue", "
 								    "try/catch", "unset", "use", "while" ];
 								    
 public str getClassItemKey(ClassItem::property(set[Modifier] modifiers, list[Property] prop, PHPType ptype, _)) = "propertyDef";
-public str getClassItemKey(ClassItem::constCI(list[Const] consts, set[Modifier] modifiers, _)) = "classConstDef";
+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";