search

dschmenk / PLASMA

Proto Language AsSeMbler for All (formerly Apple)
MIT License
189 stars 26 forks source link

Remove duplicate 'res' token declarations #52

Closed iflan closed 5 years ago

iflan commented 5 years ago

Before this change, there were two declarations for the res token in both lex.c and plasm.pla. Now there is only one.

dschmenk commented 5 years ago

Good catch. Can't figure out how that happened.

iflan commented 5 years ago

Looks like it was a bad merge here: https://github.com/dschmenk/PLASMA/commit/07fdb6a31d702478128a12a016d4d2d72b26abe5#diff-bbeec6cc96fee5c07a978d13b3681f69. Both predecessors had the res addition, but in different places.