Modified tests to exclude "Module: " prefix

chapel-lang · Oct 9, 2015 · df7d35f · df7d35f
1 parent a12669b
commit df7d35f
Show file tree

Hide file tree

Showing 114 changed files with 159 additions and 159 deletions.
diff --git a/test/chpldoc/basics/disconnectedComment.doc.good b/test/chpldoc/basics/disconnectedComment.doc.good
@@ -1,4 +1,4 @@
-Module: unattached
+unattached
    This comment should be attached to unattached but not reallyCommentless, 
    even when before the defined module 
    proc reallyCommentless()

diff --git a/test/chpldoc/basics/empty.doc.good b/test/chpldoc/basics/empty.doc.good
@@ -1,4 +1,4 @@
-Module: empty.doc
+empty.doc
    proc noComment()
    proc noBody()
    proc noBodyButArgs(num: int, bleah: bool)

diff --git a/test/chpldoc/basics/fullyCommented.doc.good b/test/chpldoc/basics/fullyCommented.doc.good
@@ -1,5 +1,5 @@
-Module: fullyCommented.doc
-   Module: fullyCommented.doc.Other
+fullyCommented.doc
+   fullyCommented.doc.Other
       proc inside
          Comment for method inside module 
 

diff --git a/test/chpldoc/basics/fullyCommented.logical.doc.good b/test/chpldoc/basics/fullyCommented.logical.doc.good
@@ -1,4 +1,4 @@
-Module: fullyCommented
+fullyCommented
    proc method1()
       Comment for method1 
 
@@ -11,7 +11,7 @@ Module: fullyCommented
    proc argAndBody(val: int)
       Comment for method with argument and body 
 
-   Module: fullyCommented.Other
+   fullyCommented.Other
       proc inside
          Comment for method inside module 
 

diff --git a/test/chpldoc/basics/hello.doc.good b/test/chpldoc/basics/hello.doc.good
@@ -1,4 +1,4 @@
-Module: hello.doc
+hello.doc
    proc hello()
       This method prints out a greeting.
 
diff --git a/test/chpldoc/basics/longerComments.doc.good b/test/chpldoc/basics/longerComments.doc.good
@@ -1,5 +1,5 @@
-Module: longerComments.doc
-   Module: longerComments.doc.Other
+longerComments.doc
+   longerComments.doc.Other
       proc inside
          This is a comment for a method inside of
          a module 

diff --git a/test/chpldoc/basics/longerComments.logical.doc.good b/test/chpldoc/basics/longerComments.logical.doc.good
@@ -1,4 +1,4 @@
-Module: longerComments
+longerComments
    proc method1()
       This is a comment for method1, which lies
       outside of a defined module 
@@ -17,7 +17,7 @@ Module: longerComments
       argument and body which lies outside of a
       defined module 
 
-   Module: longerComments.Other
+   longerComments.Other
       proc inside
          This is a comment for a method inside of
          a module 

diff --git a/test/chpldoc/basics/main.doc.bad b/test/chpldoc/basics/main.doc.bad
@@ -1,4 +1,4 @@
-Module: main
+main
    This is the only valid doc string in this modules. 
    Record: beginR
       This should not be documented 

diff --git a/test/chpldoc/basics/main.doc.good b/test/chpldoc/basics/main.doc.good
@@ -1,4 +1,4 @@
-Module: main
+main
    This is the only valid doc string in this modules. 
 
    proc foo()

diff --git a/test/chpldoc/basics/nestFunctions.doc.good b/test/chpldoc/basics/nestFunctions.doc.good
@@ -1,4 +1,4 @@
-Module: nestFunctions.doc
+nestFunctions.doc
    proc outer()
       This the comment for the outer function 
 
diff --git a/test/chpldoc/basics/parenthesesLess.doc.good b/test/chpldoc/basics/parenthesesLess.doc.good
@@ -1,4 +1,4 @@
-Module: parenthesesLess.doc
+parenthesesLess.doc
    proc foo
    proc bar: bool
    proc foo2

diff --git a/test/chpldoc/basics/sparselyCommented.doc.good b/test/chpldoc/basics/sparselyCommented.doc.good
@@ -1,5 +1,5 @@
-Module: sparselyCommented.doc
-   Module: sparselyCommented.doc.Other
+sparselyCommented.doc
+   sparselyCommented.doc.Other
       proc inside()
          Comment for method inside module 
 

diff --git a/test/chpldoc/basics/sparselyCommented.logical.doc.good b/test/chpldoc/basics/sparselyCommented.logical.doc.good
@@ -1,4 +1,4 @@
-Module: sparselyCommented
+sparselyCommented
    proc method1()
       Comment for method1 
 
@@ -15,7 +15,7 @@ Module: sparselyCommented
       Comment for method with argument and body 
 
    proc argAndBodyCommentless(val: int)
-   Module: sparselyCommented.Other
+   sparselyCommented.Other
       proc inside()
          Comment for method inside module 
 

diff --git a/test/chpldoc/classes/basic.doc.good b/test/chpldoc/classes/basic.doc.good
@@ -1,17 +1,17 @@
-Module: basic
+basic
    This is the module that Lydia built 
    proc inner()
       This is the proc that lies in the module that Lydia built 
 
-   Module: basic.sadAndAlone
+   basic.sadAndAlone
       This is the module all sad and alone, listed behind the proc
       that lies in the module that Lydia built 
       Class: naryATone
          This is the class with nary a tone, declared in the module all
          sad and alone, listed behind the proc that lies in the module
          that Lydia built 
 
-      Module: basic.sadAndAlone.classesAreGrown
+      basic.sadAndAlone.classesAreGrown
          This is the module whose classes are grown, sister of the
          class with nary a tone, declared in the module all sad and
          alone, listed behind the proc that lies in the module that

diff --git a/test/chpldoc/classes/basic.logical.doc.good b/test/chpldoc/classes/basic.logical.doc.good
@@ -1,17 +1,17 @@
-Module: basic
+basic
    This is the module that Lydia built 
    proc inner()
       This is the proc that lies in the module that Lydia built 
 
-   Module: basic.sadAndAlone
+   basic.sadAndAlone
       This is the module all sad and alone, listed behind the proc
       that lies in the module that Lydia built 
       Class: naryATone
          This is the class with nary a tone, declared in the module all
          sad and alone, listed behind the proc that lies in the module
          that Lydia built 
 
-      Module: basic.sadAndAlone.classesAreGrown
+      basic.sadAndAlone.classesAreGrown
          This is the module whose classes are grown, sister of the
          class with nary a tone, declared in the module all sad and
          alone, listed behind the proc that lies in the module that

diff --git a/test/chpldoc/classes/fieldInheritance.doc.good b/test/chpldoc/classes/fieldInheritance.doc.good
@@ -1,4 +1,4 @@
-Module: fieldInheritance.doc
+fieldInheritance.doc
    Class: Elder
       This class has two fields 
 

diff --git a/test/chpldoc/classes/fields.doc.good b/test/chpldoc/classes/fields.doc.good
@@ -1,4 +1,4 @@
-Module: fields.doc
+fields.doc
    Class: fullOfFields
       type eltType
          This is a generic type. 

diff --git a/test/chpldoc/classes/inheritance.doc.good b/test/chpldoc/classes/inheritance.doc.good
@@ -1,4 +1,4 @@
-Module: inheritance.doc
+inheritance.doc
    Class: Grandparent
       The eldest 
 

diff --git a/test/chpldoc/classes/methodOutsideClassDef.doc.good b/test/chpldoc/classes/methodOutsideClassDef.doc.good
@@ -1,4 +1,4 @@
-Module: methodOutsideClassDef.doc
+methodOutsideClassDef.doc
    Class: Foo
       This class will declare a method inside itself, but will have a
       method declared outside it as well 

diff --git a/test/chpldoc/classes/methodOutsideClassDef.logical.doc.good b/test/chpldoc/classes/methodOutsideClassDef.logical.doc.good
@@ -1,4 +1,4 @@
-Module: methodOutsideClassDef
+methodOutsideClassDef
    proc Foo.externalMeth1()
    proc Foo.externalMeth2()
       This method has a comment attached to it 

diff --git a/test/chpldoc/classes/methods.doc.good b/test/chpldoc/classes/methods.doc.good
@@ -1,4 +1,4 @@
-Module: methods.doc
+methods.doc
    Class: fullOfMethods
       proc commented()
          This is just a normal method with a comment.  I shouldn't

diff --git a/test/chpldoc/classes/multipleInheritance.doc.good b/test/chpldoc/classes/multipleInheritance.doc.good
@@ -1,4 +1,4 @@
-Module: multipleInheritance.doc
+multipleInheritance.doc
    Class: Mother
       proc eyes()
          One of Mother's methods 

diff --git a/test/chpldoc/classes/paramFields.doc.good b/test/chpldoc/classes/paramFields.doc.good
@@ -1,4 +1,4 @@
-Module: paramFields.doc
+paramFields.doc
    Class: hasParams
       param typeless
       param docTyped: int

diff --git a/test/chpldoc/compflags/alphabetical/alphabetized.doc.good b/test/chpldoc/compflags/alphabetical/alphabetized.doc.good
@@ -1,4 +1,4 @@
-Module: alphabetized.doc
+alphabetized.doc
    proc alpha()
       This method should be first 
 

diff --git a/test/chpldoc/compflags/alphabetical/classFields.doc.bad b/test/chpldoc/compflags/alphabetical/classFields.doc.bad
@@ -1,4 +1,4 @@
-Module: classFields
+classFields
    Class: Parent
       var niece
          This field should be third 

diff --git a/test/chpldoc/compflags/alphabetical/classFields.doc.good b/test/chpldoc/compflags/alphabetical/classFields.doc.good
@@ -1,4 +1,4 @@
-Module: classFields.doc
+classFields.doc
    Class: Parent
       var alone
          This field should be first 

diff --git a/test/chpldoc/compflags/alphabetical/config.doc.good b/test/chpldoc/compflags/alphabetical/config.doc.good
@@ -1,4 +1,4 @@
-Module: config.doc
+config.doc
    config const constant
       This is a config const 
    config const constantTyped: bool

diff --git a/test/chpldoc/compflags/alphabetical/constants.doc.good b/test/chpldoc/compflags/alphabetical/constants.doc.good
@@ -1,4 +1,4 @@
-Module: hasGlobalConstants.doc
+hasGlobalConstants.doc
    This module has some global scoped constants. 
    const fifth
       This constant has an associated comment and a value 

diff --git a/test/chpldoc/compflags/alphabetical/globalOrdering.doc.good b/test/chpldoc/compflags/alphabetical/globalOrdering.doc.good
@@ -1,4 +1,4 @@
-Module: globalOrdering.doc
+globalOrdering.doc
    config var goop: bool
       I should be first 
    config const resorted

diff --git a/test/chpldoc/compflags/alphabetical/methods.doc.good b/test/chpldoc/compflags/alphabetical/methods.doc.good
@@ -1,4 +1,4 @@
-Module: methods.doc
+methods.doc
    Class: fullOfMethods
       proc commentless()
       proc hasComment()

diff --git a/test/chpldoc/compflags/alphabetical/multipleInheritance.doc.good b/test/chpldoc/compflags/alphabetical/multipleInheritance.doc.good
@@ -1,4 +1,4 @@
-Module: multipleInheritance.doc
+multipleInheritance.doc
    Class: Child
       proc nose()
          A method all its own 

diff --git a/test/chpldoc/compflags/alphabetical/paramVars.doc.good b/test/chpldoc/compflags/alphabetical/paramVars.doc.good
@@ -1,4 +1,4 @@
-Module: hasGlobalParams.doc
+hasGlobalParams.doc
    This module has some global scoped params. 
    param first
    param fourth: bool

diff --git a/test/chpldoc/compflags/alphabetical/submodules.doc.good b/test/chpldoc/compflags/alphabetical/submodules.doc.good
@@ -1,7 +1,7 @@
-Module: Parent.doc
-   Module: Parent.Caroline
+Parent.doc
+   Parent.Caroline
       This child should be listed first 
-   Module: Parent.Elaine
+   Parent.Elaine
       This child should be in the middle 
-   Module: Parent.Frank
+   Parent.Frank
       This child should be listed last 
diff --git a/test/chpldoc/compflags/alphabetical/typeVars.doc.good b/test/chpldoc/compflags/alphabetical/typeVars.doc.good
@@ -1,4 +1,4 @@
-Module: hasGlobalTypes.doc
+hasGlobalTypes.doc
    This module has some global scoped types. 
    type first
    type second

diff --git a/test/chpldoc/compflags/alphabetical/variables.doc.good b/test/chpldoc/compflags/alphabetical/variables.doc.good
@@ -1,4 +1,4 @@
-Module: hasGlobalVariables.doc
+hasGlobalVariables.doc
    This module has some global scoped variables. 
    var fifth
       This variable has an associated comment and a value 

diff --git a/test/chpldoc/compflags/comment/badClose.doc.bad b/test/chpldoc/compflags/comment/badClose.doc.bad
@@ -1,4 +1,4 @@
-Module: badClose.doc
+badClose.doc
    proc bad()
       This comment is not closed properly
 
diff --git a/test/chpldoc/compflags/comment/basic.doc.good b/test/chpldoc/compflags/comment/basic.doc.good
@@ -1,4 +1,4 @@
-Module: basic.doc
+basic.doc
    proc commented()
       This is one way to make your own comment 
 
diff --git a/test/chpldoc/compflags/comment/loseComments.doc.good b/test/chpldoc/compflags/comment/loseComments.doc.good
@@ -1,2 +1,2 @@
-Module: loseComments.doc
+loseComments.doc
    proc found()
diff --git a/test/chpldoc/compflags/comment/specifiedDefault.doc.good b/test/chpldoc/compflags/comment/specifiedDefault.doc.good
@@ -1,4 +1,4 @@
-Module: specifiedDefault.doc
+specifiedDefault.doc
    proc found()
       This comment should be seen 
 
diff --git a/test/chpldoc/compflags/creole/classes.doc.good b/test/chpldoc/compflags/creole/classes.doc.good
@@ -1,19 +1,19 @@
 ----
-==Module: classes
+==classes
  This is the module that Lydia built 
 ====proc inner()
  This is the proc that lies in the module that Lydia built 
 
 ----
-==Module: classes.sadAndAlone
+==classes.sadAndAlone
  This is the module all sad and alone, listed behind the proc
      that lies in the module that Lydia built 
 ===Class: naryATone
  This is the class with nary a tone, declared in the module all
        sad and alone, listed behind the proc that lies in the module
        that Lydia built 
 ----
-==Module: classes.sadAndAlone.classesAreGrown
+==classes.sadAndAlone.classesAreGrown
  This is the module whose classes are grown, sister of the
        class with nary a tone, declared in the module all sad and
        alone, listed behind the proc that lies in the module that

diff --git a/test/chpldoc/compflags/creole/config.doc.good b/test/chpldoc/compflags/creole/config.doc.good
@@ -1,5 +1,5 @@
 ----
-==Module: config
+==config
 **config** **var **normal\\
  This is a normal config var \\
 **config** **param **other\\

diff --git a/test/chpldoc/compflags/creole/module.doc.good b/test/chpldoc/compflags/creole/module.doc.good
@@ -1,32 +1,32 @@
 ----
-==Module: M
+==M
  This module has a comment 
 ====proc commentless()
 
 ----
-==Module: N
+==N
  So does this module 
 ====proc hasArgCommentless(val: int(64))
 
 ----
-==Module: O
+==O
  And this one 
 ====proc hasBodyCommentless()
 
 ----
-==Module: P
+==P
  What?  Even this one! 
 ====proc hasBodyAndArgCommentless(val: int(64))
 
 ====proc useless()
 
 ----
-==Module: Q
+==Q
 ====proc main()
  Sadly, this method's module does not 
 
 ----
-==Module: R
+==R
 ====proc furthermore()
  Nor this method's module 
 
diff --git a/test/chpldoc/compflags/externs/externTest.doc.good b/test/chpldoc/compflags/externs/externTest.doc.good
@@ -1,2 +1,2 @@
-Module: externTest.doc
-   Module: externTest.Other
+externTest.doc
+   externTest.Other
diff --git a/test/chpldoc/compflags/folder/oneWord.doc.good b/test/chpldoc/compflags/folder/oneWord.doc.good
@@ -1,4 +1,4 @@
-Module: oneWord.doc
+oneWord.doc
    proc dummy()
       Should be located in myDocs/unspecified.txt 
 
diff --git a/test/chpldoc/compflags/folder/withHyphen.doc.good b/test/chpldoc/compflags/folder/withHyphen.doc.good
@@ -1,4 +1,4 @@
-Module: withHyphen.doc
+withHyphen.doc
    proc example()
       This should end up in my-docs/withHyphen.txt 
 
diff --git a/test/chpldoc/compflags/folder/withUnderscore.doc.good b/test/chpldoc/compflags/folder/withUnderscore.doc.good
@@ -1,4 +1,4 @@
-Module: withUnderscore.doc
+withUnderscore.doc
    proc example()
       This should end up in my_docs/withUnderscore.txt 
 
diff --git a/test/chpldoc/devel/classMethods.doc.good b/test/chpldoc/devel/classMethods.doc.good
@@ -1,4 +1,4 @@
-Module: classMethods.doc
+classMethods.doc
    proc method(_mt: _MT, this: named)
        This method has a comment