Merge pull request #188 from admire93/enum-mro

Rename mro not to overlap with Python keyword
nirum-lang · Oct 26, 2017 · 8ac04b0 · 8ac04b0
2 parents b6cbe68 + f459705
commit 8ac04b0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/Nirum/Targets/Python.hs b/src/Nirum/Targets/Python.hs
@@ -674,7 +674,7 @@ compileTypeDeclaration _ d@TypeDeclaration { typename = typename'
             "\n"
             [ T.concat [ compileDocsComment "    " m
                        , "\n    "
-                       , toAttributeName' memberName
+                       , toEnumMemberName memberName
                        , " = '"
                        , I.toSnakeCaseText bn
                        , "'"
@@ -700,6 +700,16 @@ $memberNames
     ){ ret className }:
         return cls(value.replace('-', '_'))  # FIXME: validate input
 |]
+  where
+    memberKeywords :: [T.Text]
+    memberKeywords = ["mro"]
+    toEnumMemberName :: Name -> T.Text
+    toEnumMemberName name' = if attributeName `elem` memberKeywords
+                             then attributeName `T.snoc` '_'
+                             else attributeName
+      where
+        attributeName :: T.Text
+        attributeName = toAttributeName' name'
 compileTypeDeclaration src d@TypeDeclaration { typename = typename'
                                              , type' = RecordType fields
                                              } = do

diff --git a/test/nirum_fixture/fixture/foo.nrm b/test/nirum_fixture/fixture/foo.nrm
@@ -21,6 +21,9 @@ enum eva-char = soryu-asuka-langley
               | katsuragi-misato
               | nagisa-kaworu
               ;
+enum duplicate-keyword = mro
+                       | no-mro
+                       ;
 
 record point1 (
     # Record docs.

diff --git a/test/python/primitive_test.py b/test/python/primitive_test.py
@@ -5,8 +5,9 @@
 from nirum.service import Service
 from six import PY3
 
-from fixture.foo import (CultureAgnosticName, Dog, EastAsianName,
-                         EvaChar, FloatUnbox, Gender, ImportedTypeUnbox, Irum,
+from fixture.foo import (CultureAgnosticName, Dog, DuplicateKeyword,
+                         EastAsianName, EvaChar,
+                         FloatUnbox, Gender, ImportedTypeUnbox, Irum,
                          Line, MixedName, NullService,
                          Point1, Point2, Point3d, Pop, PingService, Product,
                          Rnb, Run, Stop, Way, WesternName)
@@ -265,3 +266,14 @@ def test_service():
         PingService().ping(nonce=u'nonce')
     with raises(TypeError):
         PingService().ping(wrongkwd=u'a')
+
+
+def test_enum_duplicate_member_name():
+    assert hasattr(DuplicateKeyword, 'mro_')
+    assert hasattr(DuplicateKeyword, 'no_mro')
+    assert (DuplicateKeyword.__nirum_deserialize__(u'mro') ==
+            DuplicateKeyword.mro_)
+    assert (DuplicateKeyword.__nirum_deserialize__(u'no-mro') ==
+            DuplicateKeyword.no_mro)
+    assert DuplicateKeyword.mro_.__nirum_serialize__() == 'mro'
+    assert DuplicateKeyword.no_mro.__nirum_serialize__() == 'no_mro'