diff --git a/OrcScala/src/orc/compile/parse/OrcParsers.scala b/OrcScala/src/orc/compile/parse/OrcParsers.scala index c2a581bb8..037d6d3a3 100644 --- a/OrcScala/src/orc/compile/parse/OrcParsers.scala +++ b/OrcScala/src/orc/compile/parse/OrcParsers.scala @@ -404,8 +404,7 @@ class OrcParsers(inputContext: OrcInputContext, co: CompilerOptions, envServices val parseClassConstructor: Parser[ClassConstructor] = ( ident ~ (ListOf(parseTypeVariable)?) -> ClassConstructor.None - | "def" ~> parseDefSigCoreNamed -> ClassConstructor.Def - | "site" ~> parseDefSigCoreNamed -> ClassConstructor.Site) + ) val parseClassDeclaration = ( (parseClassConstructor ~ ("extends" ~> parseClassExpression).? ~ parseClassBody) -> ClassDeclaration) diff --git a/OrcTests/.settings/org.eclipse.core.resources.prefs b/OrcTests/.settings/org.eclipse.core.resources.prefs index 30f30fad3..035ca0364 100644 --- a/OrcTests/.settings/org.eclipse.core.resources.prefs +++ b/OrcTests/.settings/org.eclipse.core.resources.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 +encoding//test_data/functional_invalid/classes/constructors1.orc=UTF-8 encoding//test_data/functional_invalid/classes/nonexistent_class.orc=UTF-8 encoding//test_data/functional_valid/block.orc=UTF-8 encoding//test_data/functional_valid/classes/cake_pattern.orc=UTF-8 -encoding//test_data/functional_valid/classes/constructors1.orc=UTF-8 encoding//test_data/functional_valid/classes/linearization_conflict.orc=UTF-8 encoding//test_data/functional_valid/classes/recursive_methods.orc=UTF-8 encoding//test_data/functional_valid/classes/shadowing_members.orc=UTF-8 diff --git a/OrcTests/test_data/functional_valid/classes/constructors1.orc b/OrcTests/test_data/functional_invalid/classes/constructors1.orc similarity index 100% rename from OrcTests/test_data/functional_valid/classes/constructors1.orc rename to OrcTests/test_data/functional_invalid/classes/constructors1.orc diff --git a/OrcTests/test_data/functional_valid/classes/constructors2.orc b/OrcTests/test_data/functional_invalid/classes/constructors2.orc similarity index 100% rename from OrcTests/test_data/functional_valid/classes/constructors2.orc rename to OrcTests/test_data/functional_invalid/classes/constructors2.orc diff --git a/OrcTests/test_data/functional_valid/classes/constructors3.orc b/OrcTests/test_data/functional_invalid/classes/constructors3.orc similarity index 100% rename from OrcTests/test_data/functional_valid/classes/constructors3.orc rename to OrcTests/test_data/functional_invalid/classes/constructors3.orc diff --git a/OrcTests/test_data/functional_valid/classes/constructors4.orc b/OrcTests/test_data/functional_invalid/classes/constructors4.orc similarity index 100% rename from OrcTests/test_data/functional_valid/classes/constructors4.orc rename to OrcTests/test_data/functional_invalid/classes/constructors4.orc