Prevent duplicate function declarations in Python (microsoft#5744)

riknoll · web-flow · commit dc40d40441e8 · 2019-07-10T17:26:37.000-07:00
* Show errors for duplicate function declarations in python

* lf
diff --git a/pxtpy/ast.ts b/pxtpy/ast.ts
@@ -14,6 +14,8 @@ namespace pxt.py {
         pyAST?: AST;
         isProtected?: boolean;
         moduleTypeMarker?: {};
+
+        declared?: number; // A reference to the current iteration; used for detecting duplicate functions
     }
 
     export interface TypeOptions {
@@ -408,7 +410,7 @@ namespace pxt.py {
     }
     export interface Constant extends Expr {
         kind: "Constant";
-        value: any; // ??? 
+        value: any; // ???
     }
 
     // the following expression can appear in assignment context
diff --git a/pxtpy/converter.ts b/pxtpy/converter.ts
@@ -96,6 +96,7 @@ namespace pxt.py {
         delete r.pyRetType
         delete r.pySymbolType
         delete r.moduleTypeMarker
+        delete r.declared
         if (r.parameters)
             r.parameters = r.parameters.map(p => {
                 p = U.flatClone(p)
@@ -391,7 +392,7 @@ namespace pxt.py {
         }
     }
 
-    // next free error 9520; 9550-9599 reserved for parser
+    // next free error 9521; 9550-9599 reserved for parser
     function error(astNode: py.AST, code: number, msg: string) {
         diagnostics.push(mkDiag(astNode, pxtc.DiagnosticCategory.Error, code, msg))
         //const pos = position(astNode ? astNode.startPos || 0 : 0, mod.source)
@@ -924,10 +925,20 @@ namespace pxt.py {
             const topLev = isTopLevel()
 
             setupScope(n)
+            const existing = lookupSymbol(getFullName(n));
             const sym = addSymbolFor(isMethod ? SK.Method : SK.Function, n)
 
-            if (shouldInlineFunction(sym) && !inline)
-                return B.mkText("")
+            if (!inline) {
+                if (existing && existing.declared === currIteration) {
+                    error(n, 9520, lf("Duplicate function declaration"));
+                }
+
+                sym.declared = currIteration;
+
+                if (shouldInlineFunction(sym)) {
+                    return B.mkText("")
+                }
+            }
 
             if (isMethod) sym.isInstance = true
             ctx.currFun = n
@@ -1327,7 +1338,7 @@ namespace pxt.py {
                 fd.isGetSet = true
                 fdBack.isGetSet = true
                 return B.mkGroup(res)
-            } else 
+            } else
             */
             if (currIteration == 0) {
                 return B.mkText("/* skip for now */")
@@ -1733,7 +1744,7 @@ namespace pxt.py {
                     syntaxInfo.auxResult = i
                     let arg = orderedArgs[i]
                     if (!arg) {
-                        // if we can't parse this next argument, but the cursor is beyond the 
+                        // if we can't parse this next argument, but the cursor is beyond the
                         // previous arguments, assume it's here
                         break
                     }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ namespace pxt.py {`
`14`	`14`	`pyAST?: AST;`
`15`	`15`	`isProtected?: boolean;`
`16`	`16`	`moduleTypeMarker?: {};`
	`17`	`+`
	`18`	`+ declared?: number; // A reference to the current iteration; used for detecting duplicate functions`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`export interface TypeOptions {`
`@@ -408,7 +410,7 @@ namespace pxt.py {`
`408`	`410`	`}`
`409`	`411`	`export interface Constant extends Expr {`
`410`	`412`	`kind: "Constant";`
`411`		`- value: any; // ???`
	`413`	`+ value: any; // ???`
`412`	`414`	`}`
`413`	`415`
`414`	`416`	`// the following expression can appear in assignment context`