81aa981 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

C++: rework treatment of size_t and array index operator

81aa981Andy Arvanitis10 years ago

pcc/runtime/purescript.cc+6−9

compare with golang

unifiedsplit

@@ -64,6 +64,12 @@ any::operator char() const {

64 RETURN_VALUE(tag_t::Character, c,)

65}

67+any::operator size_t() const {

68+ const auto sz = cast<int>(*this);

69+ assert(sz >= 0);

70+ return static_cast<size_t>(sz);

71+}

72+

67any::operator cstring() const {

73any::operator cstring() const {

68 const any& variant = unthunkVariant(*this);

74 const any& variant = unthunkVariant(*this);

69 if (variant.tag == tag_t::StringLiteral) {

75 if (variant.tag == tag_t::StringLiteral) {

@@ -89,20 +95,11 @@ auto any::unthunkVariant(const any& a) -> const any& {

89 return *variant;

95 return *variant;

90}

96}

92−auto any::operator[](const symbol_t key) const -> const any& {

93− return PureScript::map::get(key, cast<map<unknown_size>>(*this));

94−}

95−

96auto any::operator[](const size_t rhs) const -> const any& {

98auto any::operator[](const size_t rhs) const -> const any& {

97 const auto& xs = cast<array>(*this);

99 const auto& xs = cast<array>(*this);

98 return xs[rhs];

100 return xs[rhs];

99}

101}

100

102

101−auto any::operator[](const any& rhs) const -> const any& {

102− const auto& xs = cast<array>(*this);

103− return xs[cast<int>(rhs)];

104−}

105−

106auto any::size() const -> size_t {

103auto any::size() const -> size_t {

107 return cast<array>(*this).size();

104 return cast<array>(*this).size();

108}

105}

pcc/runtime/purescript.hh+1−2

@@ -337,12 +337,11 @@ class any {

337 operator double() const;

338 operator bool() const;

339 operator char() const;

340+ operator size_t() const;

340 operator cstring() const;

341 operator cstring() const;

341 operator const array&() const;

342 operator const array&() const;

342

343

343− auto operator[](const symbol_t) const -> const any&;

344 auto operator[](const size_t) const -> const any&;

345− auto operator[](const any&) const -> const any&;

346

345

347 auto size() const -> size_t;

346 auto size() const -> size_t;

348 auto empty() const -> bool;

347 auto empty() const -> bool;

src/Language/PureScript/Pretty/Cpp.hs−1

@@ -399,7 +399,6 @@ accessor = mkPattern match

399indexer :: Pattern PrinterState Cpp (Text, Cpp)

400indexer = mkPattern' match

401 where

402− match (CppIndexer (CppNumericLiteral (Left 0)) val) = return ("0UL", val)

403 match (CppIndexer (CppNumericLiteral (Left index)) val) = return (show' index, val)

402 match (CppIndexer (CppNumericLiteral (Left index)) val) = return (show' index, val)

404 match (CppIndexer index val) = do

403 match (CppIndexer index val) = do

405 index' <- prettyPrintCpp' index

404 index' <- prettyPrintCpp' index