Changeset 1124


Ignore:
Timestamp:
Oct 1, 2012 1:08:46 PM (10 years ago)
Author:
jemian
Message:

fixes #35 and #36

Location:
specdomain/trunk/src/specdomain
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • specdomain/trunk/src/specdomain/LICENSE

    r998 r1124  
    11Copyright (c) 2011-2012, UChicago Argonne, LLC
    2 
     2Operator of Argonne National Laboratory
    33All Rights Reserved
    44
    55specdomain
    6 
    7 BCDA, Advanced Photon Source, Argonne National Laboratory
    86
    97
     
    4038
    4139Neither the United States GOVERNMENT, nor the United States Department
    42 of Energy, NOR uchicago argonne, LLC, nor any of their employees, makes
     40of Energy, NOR UChicago Argonne, LLC, nor any of their employees, makes
    4341any warranty, express or implied, or assumes any legal liability or
    4442responsibility for the accuracy, completeness, or usefulness of any
  • specdomain/trunk/src/specdomain/doc/style_guide.rst

    r1113 r1124  
    2525  throws readers out of their rhythm when they go to read it. Avoid this.
    2626
    27 With these words in mind, this style guides documents the conventions set forth
    28 to use for SPEC macros at the APS.
     27With these words in mind, this SPEC Documentation Style Guide documents
     28the conventions set forth to use for SPEC macros at the APS.
    2929
    3030The concept of docstrings
     
    178178  It is recommended to build up this section as a definition list. The headings
    179179  for each item are CAPITALIZED and end with a colon. The content under each of
    180   these items should be indented one level. This results in a more leightweight
     180  these items should be indented one level. This results in a more lightweight
    181181  layout, and prevents cluttering the tables of content with too many
    182182  subsections.
    183183 
    184   The following items should be included, preferrably in this order:
     184  The following items should be included, preferably in this order:
    185185 
    186186  * AUTHOR(S):
     
    193193  * KNOWN BUGS:
    194194 
    195   See the below example for more details on each of these items.
     195  See the example below for more details on each of these items.
    196196 
    197197
     
    278278       
    279279                Copyright (c) 2010-|current_year|, UChicago Argonne, LLC
    280        
     280                Operator of Argonne National Laboratory
    281281                All Rights Reserved
    282282       
    283283                APS SPEC macros
    284        
    285                 APS SPEC development team,
    286                 X-ray Science Division and APS Engineering Support Division,
    287                 Argonne National Laboratory
    288284       
    289285        LICENSE::
     
    321317       
    322318                Neither the United States GOVERNMENT, nor the United States Department
    323                 of Energy, NOR uchicago argonne, LLC, nor any of their employees, makes
     319                of Energy, NOR UChicago Argonne, LLC, nor any of their employees, makes
    324320                any warranty, express or implied, or assumes any legal liability or
    325321                responsibility for the accuracy, completeness, or usefulness of any
     
    389385  indicate that they should be replaced by actual values in the macro call.
    390386  Optional arguments are additionally enclosed in square brackets (``[]``).
    391   The actual USAGE syntax should appear as preformatted text, and each input
     387  The actual USAGE syntax should appear as pre-formatted text, and each input
    392388  line should start with a "``>``"-symbol to represent the SPEC command line
    393389  prompt::
  • specdomain/trunk/src/specdomain/sphinxcontrib/specmacrofileparser.py

    r1071 r1124  
    3737extended_comment_marker     = r'\"{3}'
    3838extended_comment_match      = r'(' + extended_comment_marker + r')'
    39 macro_name                  = r'[a-zA-Z_][\w_]*'
     39macro_name                  = r'\w+'
    4040macro_name_match            = r'(' + macro_name + r')'
    4141arglist_match               = r'(' + match_all + r')'
     
    9494                        + arg_list_match                    # 3: optional arguments
    9595                        + non_greedy_whitespace
    96                         + '\''                              # start body section
     96                        + r"[\\']+"                          # start body section
    9797                        + non_greedy_filler_match           # 4: body
    98                         + '\''                              # end body section
     98                        + r"[\\']+"                          # end body section
    9999                        + non_greedy_whitespace
    100100                        + r'(#.*?)?'                        # 5: optional comment
     
    201201            'local': self.handle_other,
    202202            'rdef': self.handle_other,
     203            'function rdef': self.handle_def,
    203204        }
    204205        process_first_list = ('descriptive comment', )
     
    222223            for item in db[linenumber]:
    223224                if item['objtype'] not in process_first_list:
     225                    if 'function rdef' == item['objtype']:
     226                        pass
    224227                    handler_method[item['objtype']](item, db)
    225228           
     
    423426                    if m is not None:
    424427                        objtype = 'function ' + objtype
     428                        if 'function rdef' == objtype:
     429                            pass  # TODO: Should we do something special here?
    425430                        args = m.group(1)
    426431            d = {
Note: See TracChangeset for help on using the changeset viewer.