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.

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

Add regular expression feature #57

Merged
merged 49 commits into from
Feb 21, 2024
Merged

Add regular expression feature #57

merged 49 commits into from
Feb 21, 2024

Conversation

ezhou413
Copy link
Contributor

@ezhou413 ezhou413 commented Nov 3, 2023

No description provided.

ezhou413 and others added 30 commits February 23, 2023 16:51
@ezhou413
Started work on regex, implemented Shunting-Yard algorithm
f045b0e
@Promiit
Fixed bug in Shunting-Yard
8529bfe
@Promiit
Implemented NFA Nodes and Union to use for Thompson's Construction
48e6c55
@Promiit
Implemented NFA Nodes and Union to use for Thompson's Construction
ea70aec
@ezhou413
Implemented union, kleene, and concat functions
fcb0545
@ezhou413
Implemented methods for union, concat, and kleene
0cac94b
@ezhou413
implemented all functions, need to test
cbee011
@ezhou413
redid shunting yard algorithm
790c569
@ezhou413
add comments to shunting yard
6504758
@Promiit
(Maybe) fixed convertToDrawing, added validateString
98a1540
@Promiit
(Maybe) fixed convertToDrawing, added validateString pt.2
34db1ff
@ezhou413
fixed bug in shunting-yard algo
b10505f
@ezhou413
added demo function and comments
7f61f3c
@ezhou413
refactored code, moved all functions to regex.js file and added docum…
47008c4 
…entation
@ezhou413
Merge branch 'regex' of https://github.com/flapjs/vanilla into regex
1522331
@ezhou413
fixed bugs after refactoring;
87aaefa
@ezhou413
rewrote concat, union, and kleene functions
aad951d
@ezhou413
completed function implementations, need to fix bugs
13d50f5
@ezhou413
finished algorithm implementations
5d313f1
@ezhou413
push old code
9a9debd
@ezhou413
fixed bug with sigma, added test cases
1ba7881
@ezhou413
Merge branch 'master' of https://github.com/flapjs/vanilla into regex
b1e7ac1
@ezhou413
Merge branch 'master' of https://github.com/flapjs/vanilla into regex
d1eb9b1
@ezhou413
Merge branch 'regex' of https://github.com/flapjs/vanilla into regex
3132320
@ezhou413
Revert "Merge branch 'regex' of https://github.com/flapjs/vanilla int…
77506e9 
…o regex"

This reverts commit 3132320, reversing
changes made to d1eb9b1.
@ezhou413
html and css changes
518f41c
@ezhou413
buttons now insert characters at cursor position
1d7649f
@Justin6Liu
Update index.css
a987a3d
@ezhou413
regex now converts to an nfa woooooooooo
29750db
@Justin6Liu
update index.html icon position for NFA to DFA
5f4e422
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 3, 2023 •
edited
Loading

Visit the preview URL for this PR (updated for commit 7ce291d):

https://flapjs--pr57-regex-v63zbz10.web.app

(expires Wed, 28 Feb 2024 23:22:41 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 55816c1f4a2c8918b2b2b8ee41ad5acf0bad40a2

@ezhou413 ezhou413 requested a review from benjxia November 3, 2023 00:57
@ezhou413
Copy link
Contributor Author

Need to add validator for well formed regular expression

@Lexseal
Copy link
Member

Lexseal commented Nov 10, 2023

Probably can also link up the run string page so people don't need to convert to NFA all the time. In fact, I think the actual button should be hidden since we don't want students to use it. It would be great if we generate new NFAs every time user modifies the Regex and we can do testing for strings immediately

@shishir03 shishir03 merged commit 3671d3f into master Feb 21, 2024
3 checks passed
@shishir03 shishir03 deleted the regex branch February 21, 2024 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lexseal Lexseal Awaiting requested review from Lexseal

@Justin6Liu Justin6Liu Awaiting requested review from Justin6Liu

@benjxia benjxia Awaiting requested review from benjxia

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ezhou413 @Lexseal @shishir03 @Promiit @Justin6Liu