diff --git a/scripts/rpcgen/main.py b/scripts/rpcgen/main.py index a41be489291b46f33122958846adb4959018fe84..390a9740df366440b78ca847203690267c483af0 100755 --- a/scripts/rpcgen/main.py +++ b/scripts/rpcgen/main.py @@ -47,7 +47,7 @@ def main(): # # We can delete this in a few years, once we # know users won't have a previously generated - # readonly copy lieing around. + # readonly copy lying around. try: os.unlink(args.output) except Exception: diff --git a/scripts/rpcgen/rpcgen/parser.py b/scripts/rpcgen/rpcgen/parser.py index c01ae5675556025c1b239054eac16e111db51f27..e18c44d1787718832febd59b8b9317206419732b 100644 --- a/scripts/rpcgen/rpcgen/parser.py +++ b/scripts/rpcgen/rpcgen/parser.py @@ -268,7 +268,7 @@ class XDRParser: pointer = False if type(ident) is XDRTokenPunctuation: if ident.value != "*": - raise Exception("Expected '*' or identifer, but got %s" % ident) + raise Exception("Expected '*' or identifier, but got %s" % ident) if type(typ) is XDRTypeString or type(typ) is XDRTypeOpaque: raise Exception("Pointer invalid for 'string' and 'opaque' types") @@ -332,7 +332,7 @@ class XDRParser: return XDRTypeUnsignedHyper() else: # Bare 'unsigned' isn't allowed by 'type-specifier' - # grammer in RFC 1014, but rpcgen allows it + # grammar in RFC 1014, but rpcgen allows it return XDRTypeUnsignedInt() if typ.value == "void": diff --git a/scripts/rpcgen/tests/simple.x b/scripts/rpcgen/tests/simple.x index 91a1f2d23449f7f7c79d04755a605fe4a154dd9d..766521bfd9f7be6bcdf82d5f075f9142b2b58d2f 100644 --- a/scripts/rpcgen/tests/simple.x +++ b/scripts/rpcgen/tests/simple.x @@ -22,7 +22,7 @@ case TEXT: case DATA: string creator; /* data creator */ case EXEC: - string interpretor; /* program interpretor */ + string interpreter; /* program interpreter */ }; /* * A complete file: diff --git a/scripts/rpcgen/tests/test_lexer.py b/scripts/rpcgen/tests/test_lexer.py index 7cba98057f7d71355c7257020fcceb9d3be0925a..d9fd2a2ada9e08e03c8cde1c641b9a9262230b83 100644 --- a/scripts/rpcgen/tests/test_lexer.py +++ b/scripts/rpcgen/tests/test_lexer.py @@ -80,7 +80,7 @@ def test_lexer(): XDRTokenIdentifier(line=24, column=5, value="EXEC"), XDRTokenPunctuation(line=24, column=9, value=":"), XDRTokenIdentifier(line=25, column=3, value="string"), - XDRTokenIdentifier(line=25, column=10, value="interpretor"), + XDRTokenIdentifier(line=25, column=10, value="interpreter"), XDRTokenPunctuation(line=25, column=21, value="<"), XDRTokenIdentifier(line=25, column=22, value="MAXNAMELEN"), XDRTokenPunctuation(line=25, column=32, value=">"), diff --git a/scripts/rpcgen/tests/test_parser.py b/scripts/rpcgen/tests/test_parser.py index 8527b8d6e2de20495c8f7cfd76c4064743f60e24..cc6e40ab5825a5f9492e1cc6974458f3e16bd452 100644 --- a/scripts/rpcgen/tests/test_parser.py +++ b/scripts/rpcgen/tests/test_parser.py @@ -56,7 +56,7 @@ def test_parser(): XDRUnionCase( "EXEC", XDRDeclarationVariableArray( - XDRTypeString(), "interpretor", "MAXNAMELEN" + XDRTypeString(), "interpreter", "MAXNAMELEN" ), ), ],