Changeset 858

Timestamp:

10/21/07 15:36:45 (1 year ago)

Author:

asterite

Message:

Completion on function argument name done... kind of...

Files:

• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (5 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/Argument.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/core/InternalNamingConventions.java (modified) (3 diffs)
• trunk/descent.tests/descent/tests/assist (modified) (1 prop)

trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java

@@ -18 +18 @@
-import descent.internal.compiler.env.ICompilationUnit;
-import descent.internal.compiler.parser.ASTDmdNode;
+import descent.internal.compiler.parser.Argument;
+import descent.internal.compiler.parser.Type;
+import descent.internal.compiler.parser.TypeFunction;
-import descent.internal.compiler.util.HashtableOfObject;
+import descent.internal.core.INamingRequestor;
+import descent.internal.core.InternalNamingConventions;
-import descent.internal.core.SearchableEnvironment;
-
@@ -195 +200 @@
-    
-    private void completeArgumentName(CompletionOnArgumentName node) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java

@@ -23 +23 @@
-    private ASTDmdNode assistNode;
-    private List<ICompletionOnKeyword> keywordCompletions;
+    private boolean includeExpectations = true;
-
-    public CompletionParser(int apiLevel, char[] source) {
@@ -42 +43 @@
-        
-        if (start <= cursorLocation && cursorLocation <= end) {
+            includeExpectations = false;
+            
-            assistNode = new CompletionOnModuleDeclaration(packages, module, cursorLocation);
-            return (ModuleDeclaration) assistNode;
@@ -55 +58 @@
-    
-        if (start <= cursorLocation && cursorLocation <= end) {
+            includeExpectations = false;
+            
-            assistNode = new CompletionOnImport(loc, packages, module, aliasid, isstatic, cursorLocation);
-            return (Import) assistNode;
@@ -64 +69 @@
-    @Override
-    protected Argument newArgument(int storageClass, Type at, IdentifierExp ai, Expression ae) {
-
+
+
+
+
-            assistNode = new CompletionOnArgumentName(storageClass, at, ai, ae);
-            return (Argument) assistNode;
@@ -74 +82 @@
-    @Override
-    protected void expect(char[][] toks) {
-
+
+
+
+
+
+
+
+
-            if (keywordCompletions == null) {
-                keywordCompletions = new ArrayList<ICompletionOnKeyword>();

trunk/descent.core/src/descent/internal/compiler/parser/Argument.java

@@ -177 +177 @@
-    public IdentifierExp ident;
-    public Expression defaultArg, sourceDefaultArg;
+    public TypeFunction parentType; // Added field to keep track of the argument's parent
-
-    public Argument(int storageClass, Type type, IdentifierExp ident,

trunk/descent.core/src/descent/internal/compiler/parser/Parser.java

@@ -2619 +2619 @@
-
-                t = new TypeFunction(arguments, t, varargs, linkage);
+                
+                // Assign parent of arguments
+                if (arguments != null) {
+                    for(int i = 0; i < arguments.size(); i++) {
+                        arguments.get(i).parentType = (TypeFunction) t;
+                    }
+                }
+                
-                if (save == TOKdelegate) {
-                    t = new TypeDelegate(t);
@@ -2751 +2759 @@
-
-            int[] pointer2_varargs = { varargs };
-
+         
-            varargs = pointer2_varargs[0];
-            
-            ta = new TypeFunction(arguments, t, varargs, linkage);
+            
+            // Assign parent of arguments
+            if (arguments != null) {
+                for(int i = 0; i < arguments.size(); i++) {
+                    arguments.get(i).parentType = (TypeFunction) ta;
+                }
+            }
+            
-            ta.setSourceRange(t.start, t.length);
-            

trunk/descent.core/src/descent/internal/core/InternalNamingConventions.java

@@ -22 +22 @@
-import descent.internal.codeassist.impl.AssistOptions;
-import descent.internal.compiler.impl.CompilerOptions;
+import descent.internal.compiler.parser.ASTDmdNode;
-import descent.internal.compiler.parser.ScannerHelper;
+import descent.internal.compiler.parser.Type;
+import descent.internal.compiler.parser.TypeAArray;
+import descent.internal.compiler.parser.TypeInstance;
+import descent.internal.compiler.parser.TypeSlice;
-
-public class InternalNamingConventions {
@@ -303 +308 @@
-        boolean previousIsLetter = true;
-        for(int i = sourceName.length - 1 ; i >= 0 ; i--){
-
+ || i == 0
-            boolean isLetter = ScannerHelper.isLetter(sourceName[i]);
-!previousIsUpperCase &&
+/* !previousIsUpperCase && */
-                char[] name = CharOperation.subarray(sourceName,i,sourceName.length);
-                if(name.length > 1){
@@ -432 +437 @@
-            return true;
-    }
+    
+    /**
+     * Returns a readable name for the given type.
+     */
+    public static final char[] readableName(Type type) {
+        StringBuilder sb = new StringBuilder();
+        
+        appendReadableName(type, sb);
+        
+        char[] ret = new char[sb.length()];
+        sb.getChars(0, sb.length(), ret, 0);
+        return ret;
+    }
+    
+    private static final void appendReadableName(Type type, StringBuilder sb) {
+        switch(type.getNodeType()) {
+        case ASTDmdNode.TYPE_A_ARRAY:
+            TypeAArray taa = (TypeAArray) type;         
+            appendUppercaseReadableName(taa.index, sb);         
+            sb.append("To");
+            appendUppercaseReadableName(taa.next, sb);
+            break;
+        case ASTDmdNode.TYPE_BASIC:
+            sb.append(type.toCharArray());
+            break;
+        case ASTDmdNode.TYPE_D_ARRAY:
+            appendReadableName(type.next, sb);
+            if (sb.length() == 0 || sb.charAt(sb.length() - 1) != 's') {
+                sb.append('s');
+            }
+            break;
+        case ASTDmdNode.TYPE_DELEGATE:
+            appendReadableName(type.next, sb);
+            sb.append("Dg");
+            break;
+        case ASTDmdNode.TYPE_DOT_ID_EXP:
+            sb.append(type.toCharArray());
+            break;
+        case ASTDmdNode.TYPE_FUNCTION:
+            appendReadableName(type.next, sb);
+            break;
+        case ASTDmdNode.TYPE_IDENTIFIER:
+            sb.append(type.toCharArray());
+            break;
+        case ASTDmdNode.TYPE_INSTANCE:
+            TypeInstance ti = (TypeInstance) type;
+            sb.append(ti.tempinst.name);
+            break;
+        case ASTDmdNode.TYPE_POINTER:
+            if (type.next.getNodeType() == ASTDmdNode.TYPE_FUNCTION) {
+                appendReadableName(type.next.next, sb);
+                sb.append("Func");
+            } else {
+                sb.append('p');
+                appendUppercaseReadableName(type.next, sb);
+            }
+            break;
+        case ASTDmdNode.TYPE_S_ARRAY:
+            appendReadableName(type.next, sb);
+            if (sb.length() == 0 || sb.charAt(sb.length() - 1) != 's') {
+                sb.append('s');
+            }
+            break;
+        case ASTDmdNode.TYPE_SLICE:
+            appendReadableName(type.next, sb);
+            break;
+        case ASTDmdNode.TYPE_TYPEOF:
+            sb.append("typeof");
+            break;
+        }
+    }
+    
+    private static final void appendUppercaseReadableName(Type type, StringBuilder sb) {
+        StringBuilder sb2 = new StringBuilder();
+        appendReadableName(type, sb2);
+        if (sb2.length() > 0) {
+            sb2.setCharAt(0, Character.toUpperCase(sb2.charAt(0)));
+        }
+        sb.append(sb2);
+    }
+    
-}