- Added factory method Symbol.newConstructor

- Changed method Symbol.addConstructor to receive new constructor
- as argument Changed Symbol, Analyzer, class parser and
- picklers to use new factory method Removed now unused methods
- TermSymbol.makeConstructor/newConstructor

1 files changed, 6 insertions, 2 deletions

diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index 51b156b461..cbcf042e46 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -199,9 +199,13 @@ public class CLRClassParser extends SymbolLoader {
 	    if (mtype == null)
 		continue;
 	    Symbol constr = clazz.primaryConstructor();
-	    if (constr.isInitialized()) constr = clazz.addConstructor();
 	    int mods = translateAttributes(constrs[i]);
-	    TermSymbol.newConstructor(clazz, mods).copyTo(constr);
+	    if (constr.isInitialized()) {
+                clazz.addConstructor(
+                    constr = clazz.newConstructor(Position.NOPOS, mods));
+            } else {
+                constr.flags = mods;
+            }
 	    setParamOwners(mtype, constr);
 	    constr.setInfo(mtype);
 //  	    System.out.println(clazz.allConstructors() + ": "