@@ -204,7 +204,7 @@ def build_index(self):
204
204
# Variables
205
205
varnames = subblock ['sortvars' ]
206
206
if subblock ['block' ] == 'type' :
207
- varnames .sort ()
207
+ pass # varnames.sort()
208
208
for varname in varnames :
209
209
subblock ['vars' ][varname ]['name' ] = varname
210
210
@@ -223,7 +223,7 @@ def build_index(self):
223
223
self .routines [fname ]['aliases' ].append (falias )
224
224
225
225
# Module variables
226
- for varname in sorted (block ['sortvars' ]):
226
+ for varname in block [ 'sortvars' ]: # sorted(block['sortvars']):
227
227
bvar = block ['vars' ][varname ]
228
228
if varname not in self .routines :
229
229
self .variables [varname ] = bvar
@@ -273,8 +273,10 @@ def build_index(self):
273
273
# reversed+sorted is a hack to avoid conflicts when variables share
274
274
# the same prefix
275
275
if block ['sortvars' ]:
276
+ #sreg = r'.*\b(?P<varname>%s)\b\s*(?P<dims>\([\*:,\w]+\))?[^!\)]*!\s*(?P<vardesc>.*)\s*' % '|'.join(
277
+ # reversed(sorted(block['sortvars'])))
276
278
sreg = r'.*\b(?P<varname>%s)\b\s*(?P<dims>\([\*:,\w]+\))?[^!\)]*!\s*(?P<vardesc>.*)\s*' % '|' .join (
277
- reversed (sorted ( block ['sortvars' ]) ))
279
+ reversed (block ['sortvars' ]))
278
280
block ['vardescsearch' ] = re .compile (sreg , re .I ).search
279
281
else :
280
282
block ['vardescsearch' ] = lambda x : None
@@ -681,7 +683,7 @@ def get_blocklist(self, choice, module, sort=True):
681
683
baselist = list (getattr (self , choice ).values ())
682
684
sellist = [v for v in baselist if 'module' in v and v ['module' ]
683
685
== module .lower ()]
684
- if sort :
686
+ if False : # sort:
685
687
sellist .sort (key = itemgetter ('name' ))
686
688
return sellist
687
689
@@ -1066,7 +1068,7 @@ def format_type(self, block, indent=0, bullet=True):
1066
1068
1067
1069
# Variables
1068
1070
vlines = []
1069
- for varname in sorted (block ['sortvars' ]):
1071
+ for varname in block [ 'sortvars' ]: # sorted(block['sortvars']):
1070
1072
bvar = block ['vars' ][varname ]
1071
1073
vlines .append (self .format_argfield (bvar , role = 'f' ))
1072
1074
variables = self .format_lines (vlines , indent = indent + 1 ) + '\n '
0 commit comments