merge OFTN version #2

Merged

weskerfoot merged 4 commits from master into master 11 years ago

Author	SHA1	Message	Date
Wesley Kerfoot	37813d489e	Merge pull request #1 from nisstyre56/master Merge pull request #1 from oftn/master	11 years ago
nisstyre56	65b2717d5b	removed spurious check on else variants	11 years ago
nisstyre56	3b464b81cf	should error if an if-then-else expression has no else variant (must be that way due to the type system)	11 years ago
nisstyre56	72374c9212	fixed error handling for dangling else	11 years ago