true if the given type is VAR_CLASS,
- * FIELD_CLASS, FUNC_CLASS,
- * METH_CLASS, CLASS_NAME or if this is a built-in
- * attribute or non-user defined method call COLON that has a
- * ATTR_CLASS or METH_CLASS in the index
- * position 1.
+ * Returns true if the given subtree resolves to a VAR_CLASS,
+ * FIELD_CLASS, FUNC_CLASS, METH_CLASS,
+ * CLASS_NAME or if this is a built-in attribute or non-user defined method call
+ * COLON that has a ATTR_CLASS or METH_CLASS in the
+ * index position 1.
+ *
+ * Parenthesis will be ignored and the contained sub-expression will be checked.
*
* @param node
* AST node to test.
*
* @return true if the type represents an object reference.
*/
- private boolean isObjectType(Aast node)
+ private boolean isObjectSubtree(Aast node)
{
- return isObjectType(node.getType());
+ int type = node.getType();
+ Aast ref = node;
+
+ while (ref != null && type == LPARENS)
+ {
+ ref = ref.getChildAt(0);
+
+ if (ref == null)
+ {
+ break;
+ }
+
+ type = ref.getType();
+ }
+
+ return isObjectType(type);
}
/**
* Returns true if the given type is VAR_CLASS,
- * FIELD_CLASS, FUNC_CLASS,
- * METH_CLASS, CLASS_NAME or
- * ATTR_CLASS.
+ * FIELD_CLASS, FUNC_CLASS, METH_CLASS,
+ * CLASS_NAME or ATTR_CLASS.
*
* @param type
* The type to test.
@@ -8652,6 +8668,35 @@
}
/**
+ * Returns true if the given subtree resolves to a CLASS_NAME.
+ * Parenthesis will be ignored and the contained sub-expression will be checked.
+ *
+ * @param node
+ * AST node to test.
+ *
+ * @return true if the type represents an class reference.
+ */
+ private boolean isStaticObject(Aast node)
+ {
+ int type = node.getType();
+ Aast ref = node;
+
+ while (ref != null && type == LPARENS)
+ {
+ ref = ref.getChildAt(0);
+
+ if (ref == null)
+ {
+ break;
+ }
+
+ type = ref.getType();
+ }
+
+ return (type == CLASS_NAME);
+ }
+
+ /**
* Find the class name referenced by the given object reference.
*
* @param node
@@ -8663,7 +8708,22 @@
*/
private String getObjectClassName(Aast node)
{
- return (String) node.getAnnotation("qualified");
+ int type = node.getType();
+ Aast ref = node;
+
+ while (ref != null && type == LPARENS)
+ {
+ ref = ref.getChildAt(0);
+
+ if (ref == null)
+ {
+ break;
+ }
+
+ type = ref.getType();
+ }
+
+ return (String) ref.getAnnotation("qualified");
}
/**
@@ -25651,13 +25711,13 @@
// COM-HANDLE reference (or possible reference)
active_x = isComHandleType(refnode);
-
+
// determine if the primary expression is an object or class reference
- object = isObjectType(refnode);
+ object = isObjectSubtree(refnode);
if (object)
{
- isStatic = (refnode.getType() == CLASS_NAME);
+ isStatic = isStaticObject(refnode);
// determine to what specific class that reference refers
cls = getObjectClassName(refnode);
@@ -26932,8 +26992,7 @@
// write our function-specific annotations
sym.annotateFunction(#c.getText(), ##, false);
- // the above probably did not set the class name so we force it
- // here
+ // the above probably did not set the class name so we force it here
String qname = (String) #udt.getAnnotation("qualified");
sym.annotateClassRef(qname, ##);
}
@@ -28783,7 +28842,19 @@
*/
new_phrase
:
- KW_NEW^ user_defined_type_name param_passing_list[false]
+ KW_NEW^ udt:user_defined_type_name param_passing_list[false]
+ {
+ // save the original token type, then rewrite the type
+ ##.putAnnotation("oldtype", new Long(##.getType()));
+ ##.setType(FUNC_CLASS);
+
+ // write our function-specific annotations
+ sym.annotateFunction(##.getText(), ##, false);
+
+ // the above probably did not set the class name so we force it here
+ String qname = (String) #udt.getAnnotation("qualified");
+ sym.annotateClassRef(qname, ##);
+ }
;
/**
@@ -28801,6 +28872,17 @@
:
KW_NO_ERROR
)?
+ {
+ // save the original token type, then rewrite the type
+ ##.putAnnotation("oldtype", new Long(##.getType()));
+ ##.setType(FUNC_CLASS);
+
+ // write our function-specific annotations
+ sym.annotateFunction(##.getText(), ##, false);
+
+ // the above probably did not set the class name so we force it here
+ sym.annotateClassRef("Progress.Lang.Object", ##);
+ }
;
/**