New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update js_iterator.ml #1217

Open

davesnx wants to merge 1 commit into main from remove-wrong-melas-in-jsiterator

Member

davesnx commented Nov 15, 2024

Since records with underscore at the last position gets ommited, there's no reason to add mel.as, but also mel.as was placed in the wrong field.

Checking the playground found everything works as expected https://melange.re/unstable/playground/?language=OCaml&code=bW9kdWxlIERvbV9ibG9iID0gc3RydWN0CiAgKCogaHR0cHM6Ly9kZXZlbG9wZXIubW96aWxsYS5vcmcvZW4tVVMvZG9jcy9XZWIvQVBJL0Jsb2IvQmxvYiAqKQogIHR5cGUgdAoKICBleHRlcm5hbCBtYWtlIDogc3RyaW5nIEpzLkl0ZXJhdG9yLnQgLT4gdCA9ICJCbG9iIiBbQEBtZWwubmV3XQoKICBleHRlcm5hbCBhcnJheUJ1ZmZlciA6IHQgLT4gSnMuVHlwZWRfYXJyYXkuQXJyYXlCdWZmZXIudCBKcy5Qcm9taXNlLnQKICAgID0gImFycmF5QnVmZmVyIgoKICBleHRlcm5hbCBzaXplIDogdCAtPiBmbG9hdCA9ICJzaXplIiBbQEBtZWwuZ2V0XQoKICBleHRlcm5hbCBzbGljZSA6ID9zdGFydDppbnQgLT4gP2VuZF86aW50IC0%2BID9jb250ZW50VHlwZTpzdHJpbmcgLT4gdCA9ICJzbGljZSIKICBbQEBtZWwuc2VuZC5waXBlOiB0XQoKICBleHRlcm5hbCB0ZXh0IDogdCAtPiBzdHJpbmcgSnMuUHJvbWlzZS50ID0gInRleHQiIFtAQG1lbC5zZW5kXQogIGV4dGVybmFsIHR5cGVfIDogdCAtPiBzdHJpbmcgPSAidHlwZSIgW0BAbWVsLmdldF0KCiAgKCogc3RyZWFtIGNhbid0IGJlIGJpbmRlZCB1bnRpbCB3ZSBoYXZlIHNvbWUgYmluZGluZ3MgdG8gUmVhZGFibGVTdHJlYW0gKikKICAoKiBodHRwczovL2RldmVsb3Blci5tb3ppbGxhLm9yZy9lbi1VUy9kb2NzL1dlYi9BUEkvUmVhZGFibGVTdHJlYW0gKikKICAoKiBleHRlcm5hbCBzdHJlYW0gOiB0IC0%2BIFJlYWRhYmxlU3RyZWFtLnQgPSAic3RyZWFtIiAqKQplbmQKCm1vZHVsZSBEb21fZmlsZSA9IHN0cnVjdAogICgqIGh0dHBzOi8vZGV2ZWxvcGVyLm1vemlsbGEub3JnL2VuLVVTL2RvY3MvV2ViL0FQSS9GaWxlICopCiAgdHlwZSB0CgogIGV4dGVybmFsIG1ha2UgOiBzdHJpbmcgSnMuSXRlcmF0b3IudCAtPiB0ID0gIkJsb2IiIFtAQG1lbC5uZXddIFtAQG1lbC5zZW5kXQoKICBleHRlcm5hbCBhcnJheUJ1ZmZlciA6IHQgLT4gSnMuVHlwZWRfYXJyYXkuQXJyYXlCdWZmZXIudCBKcy5Qcm9taXNlLnQKICAgID0gImFycmF5QnVmZmVyIgoKICBleHRlcm5hbCBzaXplIDogdCAtPiBmbG9hdCA9ICJzaXplIiBbQEBtZWwuZ2V0XQoKICBleHRlcm5hbCBzbGljZSA6ID9zdGFydDppbnQgLT4gP2VuZF86aW50IC0%2BID9jb250ZW50VHlwZTpzdHJpbmcgLT4gdCA9ICJzbGljZSIKICBbQEBtZWwuc2VuZC5waXBlOiB0XQoKICBleHRlcm5hbCB0ZXh0IDogdCAtPiBzdHJpbmcgSnMuUHJvbWlzZS50ID0gInRleHQiIFtAQG1lbC5zZW5kXQogIGV4dGVybmFsIHR5cGVfIDogdCAtPiBzdHJpbmcgPSAidHlwZSIgW0BAbWVsLmdldF0KCiAgKCogc3RyZWFtIGNhbid0IGJlIGJpbmRlZCB1bnRpbCB3ZSBoYXZlIHNvbWUgYmluZGluZ3MgdG8gUmVhZGFibGVTdHJlYW0gKikKICAoKiBodHRwczovL2RldmVsb3Blci5tb3ppbGxhLm9yZy9lbi1VUy9kb2NzL1dlYi9BUEkvUmVhZGFibGVTdHJlYW0gKikKICAoKiBleHRlcm5hbCBzdHJlYW0gOiB0IC0%2BIFJlYWRhYmxlU3RyZWFtLnQgPSAic3RyZWFtIiAqKQoKICBleHRlcm5hbCBsYXN0TW9kaWZpZWQgOiB0IC0%2BIGZsb2F0ID0gImxhc3RNb2RpZmllZCIgW0BAbWVsLmdldF0KICBleHRlcm5hbCBuYW1lIDogdCAtPiBzdHJpbmcgPSAibmFtZSIgW0BAbWVsLmdldF0KICBleHRlcm5hbCBwcmV2aWV3IDogdCAtPiBzdHJpbmcgPSAicHJldmlldyIgW0BAbWVsLmdldF0KZW5kCgp0eXBlIHQKdHlwZSBlbnRyeVZhbHVlCgpleHRlcm5hbCBtYWtlIDogdW5pdCAtPiB0ID0gIkZvcm1EYXRhIiBbQEBtZWwubmV3XQoKZXh0ZXJuYWwgYXBwZW5kIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6c3RyaW5nIC0%2BIHVuaXQgPSAiYXBwZW5kIgpbQEBtZWwuc2VuZC5waXBlOiB0XQoKZXh0ZXJuYWwgZGVsZXRlIDogc3RyaW5nIC0%2BIHVuaXQgPSAiZGVsZXRlIiBbQEBtZWwuc2VuZC5waXBlOiB0XQoKZXh0ZXJuYWwgZ2V0IDogc3RyaW5nIC0%2BIGVudHJ5VmFsdWUgb3B0aW9uID0gImdldCIKW0BAbWVsLnNlbmQucGlwZTogdF0gW0BAbWVsLnJldHVybiBudWxsX3RvX29wdF0KCmV4dGVybmFsIGdldEFsbCA6IHN0cmluZyAtPiBlbnRyeVZhbHVlIGFycmF5ID0gImdldEFsbCIgW0BAbWVsLnNlbmQucGlwZTogdF0KZXh0ZXJuYWwgc2V0IDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6c3RyaW5nIC0%2BIHVuaXQgPSAic2V0IiBbQEBtZWwuc2VuZC5waXBlOiB0XQpleHRlcm5hbCBoYXMgOiBuYW1lOnN0cmluZyAtPiBib29sID0gImhhcyIgW0BAbWVsLnNlbmQucGlwZTogdF0KZXh0ZXJuYWwga2V5cyA6IHQgLT4gc3RyaW5nIEpzLkl0ZXJhdG9yLnQgPSAia2V5cyIgW0BAbWVsLnNlbmRdCmV4dGVybmFsIHZhbHVlcyA6IHQgLT4gZW50cnlWYWx1ZSBKcy5JdGVyYXRvci50ID0gInZhbHVlcyIgW0BAbWVsLnNlbmRdCgpleHRlcm5hbCBhcHBlbmRPYmplY3QgOgogIG5hbWU6c3RyaW5nIC0%2BIHZhbHVlOjwgLi4gPiBKcy50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBhcHBlbmRCbG9iIDoKICBuYW1lOnN0cmluZyAtPiB2YWx1ZTpEb21fYmxvYi50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBhcHBlbmRGaWxlIDoKICBuYW1lOnN0cmluZyAtPiB2YWx1ZTpEb21fZmlsZS50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRPYmplY3QgOgogIG5hbWU6c3RyaW5nIC0%2BIHZhbHVlOjwgLi4gPiBKcy50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRCbG9iIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6RG9tX2Jsb2IudCAtPiA%2FZmlsZW5hbWU6c3RyaW5nIC0%2BIHVuaXQKICA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRGaWxlIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6RG9tX2ZpbGUudCAtPiA%2FZmlsZW5hbWU6c3RyaW5nIC0%2BIHVuaXQKICA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBlbnRyaWVzIDogdCAtPiAoc3RyaW5nICogZW50cnlWYWx1ZSkgSnMuSXRlcmF0b3IudCA9ICJlbnRyaWVzIgpbQEBtZWwuc2VuZF0KCmxldCAoKSA9CiAgbGV0IGYgPSBtYWtlICgpIGluCiAgbGV0ICgpID0gc2V0IH5uYW1lOiJhZ2UiIH52YWx1ZToiMzMiIGYgaW4KICBsZXQgaXRlcmF0b3IgPSBKcy5BcnJheS52YWx1ZXMgW3wgIjEiOyAiMiI7ICIzIiB8XSBpbgoKICAoKiBNYW51YWwgaXRlcmF0aW9uIHVzaW5nIG5leHQoKSAqKQogIGxldCByZWMgcHJvY2Vzc19pdGVyYXRvciBpdGVyID0KICAgIGxldCByZXN1bHQgPSBKcy5JdGVyYXRvci5uZXh0IGl0ZXIgaW4KICAgIG1hdGNoIHJlc3VsdC52YWx1ZSB3aXRoCiAgICB8IFNvbWUgdiAtPgogICAgICAgIFByaW50Zi5wcmludGYgIlZhbHVlOiAlc1xuIiB2OwogICAgICAgIGlmIHJlc3VsdC5kb25lXyA8PiBTb21lIHRydWUgdGhlbiBwcm9jZXNzX2l0ZXJhdG9yIGl0ZXIKICAgIHwgTm9uZSAtPiAoKQogIGluCgogIGxldCAoKSA9IHByb2Nlc3NfaXRlcmF0b3IgaXRlcmF0b3IgaW4KCiAgbGV0IGJsb2IgPSBEb21fYmxvYi5tYWtlIGl0ZXJhdG9yIGluCiAgbGV0ICgpID0gc2V0QmxvYiB%2BbmFtZToiYWdlIiB%2BdmFsdWU6YmxvYiBmIGluCiAgKCogbGV0IGFnZSA9IGdldCB%2BbmFtZToiYWdlIiBmIGluICopCiAgSnMubG9nIGYK&live=off


          Update js_iterator.ml

0ee502d

Since records with underscore at the last position gets ommited, there's no reason to add mel.as, but also mel.as was placed in the wrong field.

Checking the playground found everything works as expected https://melange.re/unstable/playground/?language=OCaml&code=bW9kdWxlIERvbV9ibG9iID0gc3RydWN0CiAgKCogaHR0cHM6Ly9kZXZlbG9wZXIubW96aWxsYS5vcmcvZW4tVVMvZG9jcy9XZWIvQVBJL0Jsb2IvQmxvYiAqKQogIHR5cGUgdAoKICBleHRlcm5hbCBtYWtlIDogc3RyaW5nIEpzLkl0ZXJhdG9yLnQgLT4gdCA9ICJCbG9iIiBbQEBtZWwubmV3XQoKICBleHRlcm5hbCBhcnJheUJ1ZmZlciA6IHQgLT4gSnMuVHlwZWRfYXJyYXkuQXJyYXlCdWZmZXIudCBKcy5Qcm9taXNlLnQKICAgID0gImFycmF5QnVmZmVyIgoKICBleHRlcm5hbCBzaXplIDogdCAtPiBmbG9hdCA9ICJzaXplIiBbQEBtZWwuZ2V0XQoKICBleHRlcm5hbCBzbGljZSA6ID9zdGFydDppbnQgLT4gP2VuZF86aW50IC0%2BID9jb250ZW50VHlwZTpzdHJpbmcgLT4gdCA9ICJzbGljZSIKICBbQEBtZWwuc2VuZC5waXBlOiB0XQoKICBleHRlcm5hbCB0ZXh0IDogdCAtPiBzdHJpbmcgSnMuUHJvbWlzZS50ID0gInRleHQiIFtAQG1lbC5zZW5kXQogIGV4dGVybmFsIHR5cGVfIDogdCAtPiBzdHJpbmcgPSAidHlwZSIgW0BAbWVsLmdldF0KCiAgKCogc3RyZWFtIGNhbid0IGJlIGJpbmRlZCB1bnRpbCB3ZSBoYXZlIHNvbWUgYmluZGluZ3MgdG8gUmVhZGFibGVTdHJlYW0gKikKICAoKiBodHRwczovL2RldmVsb3Blci5tb3ppbGxhLm9yZy9lbi1VUy9kb2NzL1dlYi9BUEkvUmVhZGFibGVTdHJlYW0gKikKICAoKiBleHRlcm5hbCBzdHJlYW0gOiB0IC0%2BIFJlYWRhYmxlU3RyZWFtLnQgPSAic3RyZWFtIiAqKQplbmQKCm1vZHVsZSBEb21fZmlsZSA9IHN0cnVjdAogICgqIGh0dHBzOi8vZGV2ZWxvcGVyLm1vemlsbGEub3JnL2VuLVVTL2RvY3MvV2ViL0FQSS9GaWxlICopCiAgdHlwZSB0CgogIGV4dGVybmFsIG1ha2UgOiBzdHJpbmcgSnMuSXRlcmF0b3IudCAtPiB0ID0gIkJsb2IiIFtAQG1lbC5uZXddIFtAQG1lbC5zZW5kXQoKICBleHRlcm5hbCBhcnJheUJ1ZmZlciA6IHQgLT4gSnMuVHlwZWRfYXJyYXkuQXJyYXlCdWZmZXIudCBKcy5Qcm9taXNlLnQKICAgID0gImFycmF5QnVmZmVyIgoKICBleHRlcm5hbCBzaXplIDogdCAtPiBmbG9hdCA9ICJzaXplIiBbQEBtZWwuZ2V0XQoKICBleHRlcm5hbCBzbGljZSA6ID9zdGFydDppbnQgLT4gP2VuZF86aW50IC0%2BID9jb250ZW50VHlwZTpzdHJpbmcgLT4gdCA9ICJzbGljZSIKICBbQEBtZWwuc2VuZC5waXBlOiB0XQoKICBleHRlcm5hbCB0ZXh0IDogdCAtPiBzdHJpbmcgSnMuUHJvbWlzZS50ID0gInRleHQiIFtAQG1lbC5zZW5kXQogIGV4dGVybmFsIHR5cGVfIDogdCAtPiBzdHJpbmcgPSAidHlwZSIgW0BAbWVsLmdldF0KCiAgKCogc3RyZWFtIGNhbid0IGJlIGJpbmRlZCB1bnRpbCB3ZSBoYXZlIHNvbWUgYmluZGluZ3MgdG8gUmVhZGFibGVTdHJlYW0gKikKICAoKiBodHRwczovL2RldmVsb3Blci5tb3ppbGxhLm9yZy9lbi1VUy9kb2NzL1dlYi9BUEkvUmVhZGFibGVTdHJlYW0gKikKICAoKiBleHRlcm5hbCBzdHJlYW0gOiB0IC0%2BIFJlYWRhYmxlU3RyZWFtLnQgPSAic3RyZWFtIiAqKQoKICBleHRlcm5hbCBsYXN0TW9kaWZpZWQgOiB0IC0%2BIGZsb2F0ID0gImxhc3RNb2RpZmllZCIgW0BAbWVsLmdldF0KICBleHRlcm5hbCBuYW1lIDogdCAtPiBzdHJpbmcgPSAibmFtZSIgW0BAbWVsLmdldF0KICBleHRlcm5hbCBwcmV2aWV3IDogdCAtPiBzdHJpbmcgPSAicHJldmlldyIgW0BAbWVsLmdldF0KZW5kCgp0eXBlIHQKdHlwZSBlbnRyeVZhbHVlCgpleHRlcm5hbCBtYWtlIDogdW5pdCAtPiB0ID0gIkZvcm1EYXRhIiBbQEBtZWwubmV3XQoKZXh0ZXJuYWwgYXBwZW5kIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6c3RyaW5nIC0%2BIHVuaXQgPSAiYXBwZW5kIgpbQEBtZWwuc2VuZC5waXBlOiB0XQoKZXh0ZXJuYWwgZGVsZXRlIDogc3RyaW5nIC0%2BIHVuaXQgPSAiZGVsZXRlIiBbQEBtZWwuc2VuZC5waXBlOiB0XQoKZXh0ZXJuYWwgZ2V0IDogc3RyaW5nIC0%2BIGVudHJ5VmFsdWUgb3B0aW9uID0gImdldCIKW0BAbWVsLnNlbmQucGlwZTogdF0gW0BAbWVsLnJldHVybiBudWxsX3RvX29wdF0KCmV4dGVybmFsIGdldEFsbCA6IHN0cmluZyAtPiBlbnRyeVZhbHVlIGFycmF5ID0gImdldEFsbCIgW0BAbWVsLnNlbmQucGlwZTogdF0KZXh0ZXJuYWwgc2V0IDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6c3RyaW5nIC0%2BIHVuaXQgPSAic2V0IiBbQEBtZWwuc2VuZC5waXBlOiB0XQpleHRlcm5hbCBoYXMgOiBuYW1lOnN0cmluZyAtPiBib29sID0gImhhcyIgW0BAbWVsLnNlbmQucGlwZTogdF0KZXh0ZXJuYWwga2V5cyA6IHQgLT4gc3RyaW5nIEpzLkl0ZXJhdG9yLnQgPSAia2V5cyIgW0BAbWVsLnNlbmRdCmV4dGVybmFsIHZhbHVlcyA6IHQgLT4gZW50cnlWYWx1ZSBKcy5JdGVyYXRvci50ID0gInZhbHVlcyIgW0BAbWVsLnNlbmRdCgpleHRlcm5hbCBhcHBlbmRPYmplY3QgOgogIG5hbWU6c3RyaW5nIC0%2BIHZhbHVlOjwgLi4gPiBKcy50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBhcHBlbmRCbG9iIDoKICBuYW1lOnN0cmluZyAtPiB2YWx1ZTpEb21fYmxvYi50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBhcHBlbmRGaWxlIDoKICBuYW1lOnN0cmluZyAtPiB2YWx1ZTpEb21fZmlsZS50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJhcHBlbmQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRPYmplY3QgOgogIG5hbWU6c3RyaW5nIC0%2BIHZhbHVlOjwgLi4gPiBKcy50IC0%2BID9maWxlbmFtZTpzdHJpbmcgLT4gdW5pdCA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRCbG9iIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6RG9tX2Jsb2IudCAtPiA%2FZmlsZW5hbWU6c3RyaW5nIC0%2BIHVuaXQKICA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBzZXRGaWxlIDogbmFtZTpzdHJpbmcgLT4gdmFsdWU6RG9tX2ZpbGUudCAtPiA%2FZmlsZW5hbWU6c3RyaW5nIC0%2BIHVuaXQKICA9ICJzZXQiCltAQG1lbC5zZW5kLnBpcGU6IHRdCgpleHRlcm5hbCBlbnRyaWVzIDogdCAtPiAoc3RyaW5nICogZW50cnlWYWx1ZSkgSnMuSXRlcmF0b3IudCA9ICJlbnRyaWVzIgpbQEBtZWwuc2VuZF0KCmxldCAoKSA9CiAgbGV0IGYgPSBtYWtlICgpIGluCiAgbGV0ICgpID0gc2V0IH5uYW1lOiJhZ2UiIH52YWx1ZToiMzMiIGYgaW4KICBsZXQgaXRlcmF0b3IgPSBKcy5BcnJheS52YWx1ZXMgW3wgIjEiOyAiMiI7ICIzIiB8XSBpbgoKICAoKiBNYW51YWwgaXRlcmF0aW9uIHVzaW5nIG5leHQoKSAqKQogIGxldCByZWMgcHJvY2Vzc19pdGVyYXRvciBpdGVyID0KICAgIGxldCByZXN1bHQgPSBKcy5JdGVyYXRvci5uZXh0IGl0ZXIgaW4KICAgIG1hdGNoIHJlc3VsdC52YWx1ZSB3aXRoCiAgICB8IFNvbWUgdiAtPgogICAgICAgIFByaW50Zi5wcmludGYgIlZhbHVlOiAlc1xuIiB2OwogICAgICAgIGlmIHJlc3VsdC5kb25lXyA8PiBTb21lIHRydWUgdGhlbiBwcm9jZXNzX2l0ZXJhdG9yIGl0ZXIKICAgIHwgTm9uZSAtPiAoKQogIGluCgogIGxldCAoKSA9IHByb2Nlc3NfaXRlcmF0b3IgaXRlcmF0b3IgaW4KCiAgbGV0IGJsb2IgPSBEb21fYmxvYi5tYWtlIGl0ZXJhdG9yIGluCiAgbGV0ICgpID0gc2V0QmxvYiB%2BbmFtZToiYWdlIiB%2BdmFsdWU6YmxvYiBmIGluCiAgKCogbGV0IGFnZSA9IGdldCB%2BbmFtZToiYWdlIiBmIGluICopCiAgSnMubG9nIGYK&live=off

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet