Changeset 4049

Timestamp:

Dec 17, 2008, 9:03:08 PM (12 years ago)

Author:

yura

Message:

• F3 for functions goes to definition, then to declaration, then to definition and so on.

File:

• devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/AstInfo.java (modified) (3 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/AstInfo.java

@@ -7 +7 @@
 import org.refal.rfpdt.ast.AstDecl;
 import org.refal.rfpdt.ast.AstFence;
+import org.refal.rfpdt.ast.AstFuncDecl;
 import org.refal.rfpdt.ast.AstFuncDef;
 import org.refal.rfpdt.ast.AstImplem;
@@ -79 +80 @@
         return null;
     }
+    
+    private static AstNode getFuncDef (AstDecl astNode) {
+        if (astNode instanceof AstFuncDecl && ((AstFuncDecl) astNode).funcDef != null)
+            return ((AstFuncDecl) astNode).funcDef;
+        else
+            return getDeclName(astNode);
+    }
+
+    private static AstNode getDeclName (AstDecl astNode) {
+        return astNode != null ? astNode.name : null;
+    }
 
     /** May return <code>null<code>! */
@@ -97 +109 @@
         else if (size > 1 && astNodeList.get(size - 1) instanceof AstName) {
             AstNode astNode = astNodeList.get(size - 2);
-            AstDecl astDecl = null;
             if (astNode instanceof AstDecl)
-                astDecl = (AstDecl) astNode;
+                return getFuncDef((AstDecl) astNode);
             else if (astNode instanceof AstFuncDef)
-                astDecl = ((AstFuncDef) astNode).funcDecl;
+                return getDeclName(((AstFuncDef) astNode).funcDecl);
             else if (astNode instanceof AstRef)
-                astDecl = ((AstRef) astNode).decl;
+                return getFuncDef(((AstRef) astNode).decl);
             else if (astNode instanceof AstCall)
-                astDecl = ((AstCall) astNode).funcDecl;
+                return getFuncDef(((AstCall) astNode).funcDecl);
             else if (astNode instanceof AstNative)
-                astDecl = ((AstNative) astNode).funcDecl;
+                return getDeclName(((AstNative) astNode).funcDecl);
             else
                 return null;
-            return astDecl != null ? astDecl.name : null;
         }
         return null;