Code

dummy test branch (DO NOT MERGE!!!)#82

Code

Open

shreyasaha1997 wants to merge 68 commits intoucsd-cse231-s22:2022ucsd-cse231-s22/chocopy-wasm-compiler-A:2022from pratyush82:resolving_conflictspratyush82/chocopy-wasm-compiler-A-base:resolving_conflictsCopy head branch name to clipboard

+1,218-6

Commits

Commits on May 7, 2022

• initial designs

  pratyush82

  committed
  fb8433f

  Copy full SHA for fb8433f

• updated md and ast file

  shreyasaha1997

  committed
  af8f687

  Copy full SHA for af8f687

• corrected error message

  shreyasaha1997

  committed
  0b9fea9

  Copy full SHA for 0b9fea9

Commits on May 11, 2022

• updated .gitignore

  pratyush82

  committed
  3831a42

  Copy full SHA for 3831a42

• updated files

  pratyush82

  committed
  91d4d04

  Copy full SHA for 91d4d04

Commits on May 12, 2022

• Merge remote-tracking branch 'upstream/2022' into 2022

  pratyush82

  committed
  565bc5e

  Copy full SHA for 565bc5e

• tc added for conditions and invalid range

  shreyasaha1997

  committed
  1cfdc54

  Copy full SHA for 1cfdc54

Commits on May 13, 2022

• added typecheck test cases

  shreyasaha1997

  committed
  1879093

  Copy full SHA for 1879093

• fixed if condition error

  shreyasaha1997

  committed
  3977e60

  Copy full SHA for 3977e60

• Merge remote-tracking branch 'origin/cse_231_shreya' into 2022

  pratyush82

  committed
  1956a69

  Copy full SHA for 1956a69

• upd

  pratyush82

  committed
  d3292a1

  Copy full SHA for d3292a1

• replaced list-comp with while

  shreyasaha1997

  committed
  31ee829

  Copy full SHA for 31ee829

• Merge branch 'while1' into 2022

  pratyush82

  committed
  910c963

  Copy full SHA for 910c963

Commits on May 14, 2022

• updated files

  pratyush82

  committed
  5b21ef0

  Copy full SHA for 5b21ef0

• updated design doc with test cases

  pratyush82

  committed
  caaec25

  Copy full SHA for caaec25

• Update comprehensions-design.md

  shreyasaha1997

  authored
  914c6ca

  Copy full SHA for 914c6ca

• Update comprehensions-design.md

  shreyasaha1997

  authored
  eb1c34f

  Copy full SHA for eb1c34f

• Update comprehensions-design.md

  shreyasaha1997

  authored
  5c648ab

  Copy full SHA for 5c648ab

• Update comprehensions-design.md

  shreyasaha1997

  authored
  48ed0f7

  Copy full SHA for 48ed0f7

• Update comprehensions-design.md

  shreyasaha1997

  authored
  e68ba83

  Copy full SHA for e68ba83

Commits on May 22, 2022

• tried new updates

  pratyush82

  committed
  a58486b

  Copy full SHA for a58486b

Commits on May 23, 2022

• updated files

  pratyush82

  committed
  1de670a

  Copy full SHA for 1de670a

• test cases fixes

  shreyasaha1997

  committed
  f9bfd93

  Copy full SHA for f9bfd93

• test cases fixes

  shreyasaha1997

  committed
  25c6580

  Copy full SHA for 25c6580

• Merge pull request #2 from pratyush82/comp1

  Show description for b30eedd
  pratyush82

  authored
  b30eedd

  Copy full SHA for b30eedd

• updated files

  pratyush82

  committed
  de57cab

  Copy full SHA for de57cab

• Merge pull request #3 from pratyush82/comp

  Show description for 96fcdc6
  pratyush82

  authored
  96fcdc6

  Copy full SHA for 96fcdc6

• removed commented statements

  shreyasaha1997

  committed
  239a7b3

  Copy full SHA for 239a7b3

• reverted unnecessary changes

  shreyasaha1997

  committed
  3ac4eb3

  Copy full SHA for 3ac4eb3

• Merge pull request #4 from pratyush82/comp1

  Show description for 7a030f6
  pratyush82

  authored
  7a030f6

  Copy full SHA for 7a030f6

• updated blocks in lower.ts

  pratyush82

  committed
  f1f8a11

  Copy full SHA for f1f8a11

• removed whitespace

  shreyasaha1997

  committed
  dad681f

  Copy full SHA for dad681f

• reverted gitignore changes

  shreyasaha1997

  committed
  51f128f

  Copy full SHA for 51f128f

• Merge pull request #5 from pratyush82/comp1

  Show description for 26ec9c9
  pratyush82

  authored
  26ec9c9

  Copy full SHA for 26ec9c9

• test cases and documentation fixed

  shreyasaha1997

  committed
  01d0796

  Copy full SHA for 01d0796

• upd

  pratyush82

  committed
  cfa1f07

  Copy full SHA for cfa1f07

• Merge pull request #7 from pratyush82/comp1

  Show description for dd8aec3
  pratyush82

  authored
  dd8aec3

  Copy full SHA for dd8aec3

• updated docs

  shreyasaha1997

  committed
  11e6aa9

  Copy full SHA for 11e6aa9

• Merge pull request #8 from pratyush82/comp2

  Show description for 9084146
  pratyush82

  authored
  9084146

  Copy full SHA for 9084146

• abc

  pratyush82

  committed
  c683187

  Copy full SHA for c683187

• upd

  pratyush82

  committed
  9967b11

  Copy full SHA for 9967b11

• Merge pull request #9 from pratyush82/ucsd-cse231-s22-2022

  Show description for 53b7b94
  pratyush82

  authored
  53b7b94

  Copy full SHA for 53b7b94

• added conflicts file

  pratyush82

  committed
  fd6f4b0

  Copy full SHA for fd6f4b0

Commits on May 24, 2022

• merge conflicts resolution

  shreyasaha1997

  committed
  60b1bf8

  Copy full SHA for 60b1bf8

• Merge branch '2022' of https://github.com/pratyush82/chocopy-wasm-compiler-A-base into 2022

  shreyasaha1997

  committed
  63b450c

  Copy full SHA for 63b450c

• merge conflicts resolution

  shreyasaha1997

  committed
  9228f88

  Copy full SHA for 9228f88

• conflicts resolution

  shreyasaha1997

  committed
  b5a2287

  Copy full SHA for b5a2287

• tc bug fix

  pratyush82

  committed
  8c25c25

  Copy full SHA for 8c25c25

• Merge branch '2022' of https://github.com/pratyush82/chocopy-wasm-compiler-A-base into 2022

  pratyush82

  committed
  f215abc

  Copy full SHA for f215abc

• updated files

  pratyush82

  committed
  ee0175b

  Copy full SHA for ee0175b

Commits on May 28, 2022

• resolved conflicts in lower.ts

  shreyasaha1997

  committed
  48e04a9

  Copy full SHA for 48e04a9

• resolved conflicts in lower.ts

  shreyasaha1997

  committed
  da19de8

  Copy full SHA for da19de8

Commits on May 29, 2022

• resolved conflicts in ast.ts

  shreyasaha1997

  committed
  4dabdd2

  Copy full SHA for 4dabdd2

• resolved conflicts in typecheck.ts

  shreyasaha1997

  committed
  d6fcece

  Copy full SHA for d6fcece

• resolved conflicts in parser.ts

  shreyasaha1997

  committed
  f6ebcb4

  Copy full SHA for f6ebcb4

• resolved conflicts in other files

  shreyasaha1997

  committed
  c67f981

  Copy full SHA for c67f981

• resolved conflicts in other files

  shreyasaha1997

  committed
  a1f4459

  Copy full SHA for a1f4459

• conflicts resolution

  shreyasaha1997

  committed
  6c54979

  Copy full SHA for 6c54979

• checking

  shreyasaha1997

  committed
  b07cdac

  Copy full SHA for b07cdac

• test

  shreyasaha1997

  committed
  90f607c

  Copy full SHA for 90f607c

• test

  shreyasaha1997

  committed
  1fde8e8

  Copy full SHA for 1fde8e8

• test

  shreyasaha1997

  committed
  6c1cee9

  Copy full SHA for 6c1cee9

• test

  shreyasaha1997

  committed
  bc5288e

  Copy full SHA for bc5288e

• test

  shreyasaha1997

  committed
  e8fc13c

  Copy full SHA for e8fc13c

• test

  shreyasaha1997

  committed
  0bc5577

  Copy full SHA for 0bc5577

• lower and parser fixes

  shreyasaha1997

  committed
  83b3459

  Copy full SHA for 83b3459

• build fix

  shreyasaha1997

  committed
  193f228

  Copy full SHA for 193f228

• Rename <frontend>-conflicts.md to frontend-conflicts.md

  pratyush82

  authored
  8bcb703

  Copy full SHA for 8bcb703