Commit c1f60a88 authored by Per Cederqvist's avatar Per Cederqvist

(lexer.__parse_userdefined_types): Expect @lt{} markup

(lexer.__parse_userdefined_struct): Likewise.
(lexer.__parse_userdefined_selection): Likewise.
(lexer.__parse_userdefined_enumeration_of): Likewise.
parent ca43d450
......@@ -654,15 +654,17 @@ class lexer:
elif token == 'ENUMERATION-OF':
typedef = self.__parse_userdefined_enumeration_of(line)
else:
self.__unget_token(token)
token = self.__get_lt_token()
if token == 'ARRAY':
name = self.__get_token()
name = self.__get_lt_token()
array = 1
else:
array = 0
name = token
token = self.__get_token()
if token == '|':
token = self.__get_token()
token = self.__get_lt_token()
if array or token == 'ARRAY':
self.error(self.__reader.line_no(),
"cannot mix ARRAY and ``|''")
......@@ -706,10 +708,10 @@ class lexer:
if token != ':':
self.error(self.__reader.line_no(),
"missing ``:'' near %s" % token)
token = self.__get_token()
token = self.__get_lt_token()
if token == 'ARRAY':
array = 1
token = self.__get_token()
token = self.__get_lt_token()
else:
array = 0
if not self.__bad_type(token) and not self.__bad_arg(name):
......@@ -768,10 +770,10 @@ class lexer:
if token != ':':
self.error(self.__reader.line_no(),
"missing ``:'' near %s" % token)
token = self.__get_token()
token = self.__get_lt_token()
if token == 'ARRAY':
array = 1
token = self.__get_token()
token = self.__get_lt_token()
else:
array = 0
if (not self.__bad_type(token) and not self.__bad_arg(name)
......@@ -793,7 +795,7 @@ class lexer:
"expected ``('' after ENUMERATION-OF, not ``%s''" %
token)
return None
name = self.__get_token()
name = self.__get_lt_token()
token = self.__get_token()
if token != ')':
self.error(self.__reader.line_no(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment