Skip to content
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.

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

Fixed OpenGLShader::PreProcess Logic (issue #120) #135

Merged
merged 4 commits into from Oct 5, 2019

Conversation

Puddlestomper
Copy link
Contributor


name: 'Pull Request: Implemented issue'
about: Fixes and explanatory comments for OpenGLShader::PreProcess
title: Fixed OpenGLShader::PreProcess logic (issue #120)
labels: ''
assignees: ''


PR impact (Make sure to add closing keywords)

List of related issues/PRs this will solve:

Impact Issue/PR
Relevant issue Resolves #120
Other issues this solves None
Other PRs this solves None

Proposed fix (Make sure you've read on how to contribute to Hazel)

We add two steps:

  1. Assert that nextLinePos is not std::string::npos.
  2. Split the final assign operation to let the substring run to the end of the file if pos is std::string::npos (if there is no next #type token).

We also add comments to clarify the purpose of each variable.

Additional context

This compiles and runs without error on the latest commit of Hazel.

@LovelySanta LovelySanta added the Impact:Suggestion Suggestions label Sep 24, 2019
@LovelySanta LovelySanta added this to Bugfixes (awaiting merge) in Community additions Sep 24, 2019
@LovelySanta LovelySanta merged commit 4e0a190 into TheCherno:master Oct 5, 2019
Community additions automation moved this from Bugfixes (awaiting merge) to Merged PR's Oct 5, 2019
@Puddlestomper Puddlestomper deleted the fixPreProcess branch November 7, 2019 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Community additions
  
Merged PR's
Development

Successfully merging this pull request may close these issues.

Contradiction In OpenGLShader::PreProcess
2 participants