Skip to content

Commit b881b1e

Browse files
committed
2 parents ba654c6 + fce1a98 commit b881b1e

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# ProXPL Programming Language
22

3-
<<<<<<< HEAD
43
<p align="center">
54
<b>A Professional & Modern Programming Language Compiler</b>
6-
=======
75
<div align="center">
86

97
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@@ -15,7 +13,6 @@
1513

1614
<p>
1715
<strong>Clean Syntax • Strong Type System • Rich Standard Library • C-Based Runtime</strong>
18-
>>>>>>> feature/opcode-tests
1916
</p>
2017

2118
[Quick Start](#-quick-start)
@@ -30,7 +27,7 @@
3027

3128
## 📖 About ProXPL
3229

33-
**ProXPL** is a modern programming language designed to bridge the gap between the simplicity of interpreted languages like Python and the performance of C-based runtimes. It is built for a wide range of applications, from educational compiler theory to efficient system tooling.
30+
**ProXPL** - ProX Programming Language is a modern, Indian-origin programming language designed for speed, simplicity, and professional-grade development. It combines Python-like readability with C-level performance, focusing on clean syntax, scalable systems, and a growing native ecosystem.
3431

3532
### The Philosophy
3633
* **Clarity First**: Familiar curly-brace syntax (similar to JavaScript/Go) ensures a low learning curve.
@@ -40,7 +37,6 @@
4037

4138
---
4239

43-
<<<<<<< HEAD
4440
## What is ProXPL?
4541

4642
**ProXPL** is a modern, general-purpose programming language designed for **clarity, performance, and long-term maintainability**.
@@ -82,8 +78,6 @@ ProXPL bridges the gap between **simplicity** (Python-like syntax) and **perform
8278
- **Rich Standard Library**: 75+ built-in functions for common tasks
8379
- **Modular Architecture**: Clear separation of lexer, parser, compiler, and VM
8480

85-
=======
86-
>>>>>>> feature/opcode-tests
8781
## 🚀 Key Features
8882

8983
| Feature | Description |
@@ -124,7 +118,6 @@ main();
124118
prox hello.prox
125119
```
126120

127-
<<<<<<< HEAD
128121
### 3. Build It (Coming Soon)
129122
ProXPL supports compiling to bytecode.
130123
=======
@@ -135,7 +128,6 @@ Enter your name: Alice
135128
Hello, Alice!
136129
Your lucky number is: 42
137130
```
138-
>>>>>>> feature/opcode-tests
139131

140132
---
141133

@@ -311,4 +303,4 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
311303

312304
<p align="center">
313305
Built with ❤️ by the ProXPL Community
314-
</p>
306+
</p>

0 commit comments

Comments
 (0)