cshape 0.2.1__tar.gz → 0.2.2__tar.gz

{cshape-0.2.1 → cshape-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cshape
-Version: 0.2.1
+Version: 0.2.2
 Summary: A dependency-free C AST + printer: build a tree in Python, get C11 source back
 Author-email: Alex Balan <outsiders.b@gmail.com>
 License-Expression: MIT
@@ -62,6 +62,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -77,6 +83,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.2}/README.md

@@ -44,6 +44,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -59,6 +65,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.2}/cshape.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cshape
-Version: 0.2.1
+Version: 0.2.2
 Summary: A dependency-free C AST + printer: build a tree in Python, get C11 source back
 Author-email: Alex Balan <outsiders.b@gmail.com>
 License-Expression: MIT
@@ -62,6 +62,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -77,6 +83,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.2}/cshape.py

@@ -55,13 +55,12 @@ def str_nl_indent(nl=1):
 	return s
 
 
-def render(node, style='legacy', indent='\t', newline='\n'):
+def render(node, style='legacy', indent='\t'):
 	global indent_level, styleguide, nl_symbol, indent_symbol
 
 	saved = (indent_level, styleguide, nl_symbol, indent_symbol)
 	indent_level = 0
 	styleguide = styles[style]
-	nl_symbol = newline
 	indent_symbol = indent
 
 	try:
@@ -141,11 +140,6 @@ def str_gcc_attributes(attributes):
 
 
 
-
-
-
-
-
 class CField():
 	def __init__(self, id, type, specifiers=None, nl=0):
 		#assert(isinstance(type, CType))
@@ -395,13 +389,14 @@ class KV():
 
 
 class CValue():
-	def __init__(self):
+	def __init__(self, nl=0):
 		self.mark = None
+		self.nl = nl
 
 
 class CValueIdentifier(CValue):
-	def __init__(self, id):
-		super().__init__()
+	def __init__(self, id, nl=0):
+		super().__init__(nl=nl)
 		self.id = id
 		self.precedence = 15
 
@@ -412,8 +407,8 @@ class CValueIdentifier(CValue):
 
 
 class CValueInteger(CValue):
-	def __init__(self, number, as_hex=False, nsigns=0, suffix=''):
-		super().__init__()
+	def __init__(self, number, as_hex=False, nsigns=0, suffix='', nl=0):
+		super().__init__(nl=nl)
 		assert(isinstance(number, int))
 		assert(isinstance(as_hex, bool))
 		self.precedence = 15
@@ -441,9 +436,9 @@ def string_literal_prefix(width):
 
 
 class CValueString(CValue):
-	def __init__(self, string, width):
+	def __init__(self, string, width, nl=0):
 		assert(isinstance(string, str))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.string = string
 		self.width = width
 		self.precedence = 15
@@ -475,9 +470,9 @@ def code_to_char(cc):
 
 
 class CValueChar(CValue):
-	def __init__(self, cc, width=8):
+	def __init__(self, cc, width=8, nl=0):
 		assert(isinstance(cc, int))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.char_code = cc
 		self.width = width
 		self.precedence = 15
@@ -488,8 +483,8 @@ class CValueChar(CValue):
 
 
 class CValueArray(CValue):
-	def __init__(self, items):
-		super().__init__()
+	def __init__(self, items, nl=0):
+		super().__init__(nl=nl)
 		self.items = items
 		self.precedence = 15
 
@@ -520,8 +515,8 @@ class CValueArray(CValue):
 
 
 class CValueStruct(CValue):
-	def __init__(self, items):
-		super().__init__()
+	def __init__(self, items, nl=0):
+		super().__init__(nl=nl)
 		self.items = items
 		self.precedence = 15
 
@@ -561,14 +556,14 @@ class CValueStruct(CValue):
 
 
 class CValueParen(CValue):
-	def __init__(self, value):
+	def __init__(self, value, nl=0):
 		assert(isinstance(value, CValue))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.value = value
 		self.precedence = 15
 
 	def __str__(self):
-		return '(%s)' % str_cvalue(self.value, ext_precedence=self.precedence)
+		return str_cvalue(self.value, ext_precedence=valuePrecedenceMax)
 
 
 
@@ -661,28 +656,6 @@ class CValueDereference(CValue):
 		return '*%s' % str_cvalue(self.value, ext_precedence=self.precedence)
 
 
-class CValueIncrement(CValue):
-	def __init__(self, value):
-		assert(isinstance(value, CValue))
-		super().__init__()
-		self.value = value
-		self.precedence = 13
-
-	def __str__(self):
-		return '++%s' % (str_cvalue(self.value, ext_precedence=self.precedence))
-
-
-class CValueDecrement(CValue):
-	def __init__(self, value):
-		assert(isinstance(value, CValue))
-		super().__init__()
-		self.value = value
-		self.precedence = 13
-
-	def __str__(self):
-		return '--%s' % str_cvalue(self.value, ext_precedence=self.precedence)
-
-
 class CValueUnaryPlus(CValue):
 	def __init__(self, value):
 		assert(isinstance(value, CValue))
@@ -760,7 +733,7 @@ class CValueMul(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s * %s' % (lx, rx)
 
 
@@ -775,7 +748,7 @@ class CValueDiv(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s / %s' % (lx, rx)
 
 
@@ -790,7 +763,7 @@ class CValueMod(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s %% %s' % (lx, rx)
 
 
@@ -805,7 +778,7 @@ class CValueAdd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s + %s' % (lx, rx)
 
 
@@ -820,7 +793,7 @@ class CValueSub(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s - %s' % (lx, rx)
 
 
@@ -839,7 +812,7 @@ class CValueShiftLeft(CValue):
 		lprec = self.precedence
 		if self.left.precedence == self.precedence + 1:
 			lprec = valuePrecedenceMax
-		rprec = self.precedence
+		rprec = self.precedence + 1
 		if self.right.precedence == self.precedence + 1:
 			rprec = valuePrecedenceMax
 
@@ -863,7 +836,7 @@ class CValueShiftRight(CValue):
 		lprec = self.precedence
 		if self.left.precedence == self.precedence + 1:
 			lprec = valuePrecedenceMax
-		rprec = self.precedence
+		rprec = self.precedence + 1
 		if self.right.precedence == self.precedence + 1:
 			rprec = valuePrecedenceMax
 
@@ -883,7 +856,7 @@ class CValueLt(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s < %s' % (lx, rx)
 
 
@@ -898,7 +871,7 @@ class CValueGt(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s > %s' % (lx, rx)
 
 
@@ -913,7 +886,7 @@ class CValueLE(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s <= %s' % (lx, rx)
 
 
@@ -928,7 +901,7 @@ class CValueGE(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s >= %s' % (lx, rx)
 
 
@@ -943,7 +916,7 @@ class CValueEq(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s == %s' % (lx, rx)
 
 
@@ -958,7 +931,7 @@ class CValueNe(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s != %s' % (lx, rx)
 
 
@@ -982,7 +955,7 @@ class CValueBitwiseAnd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s & %s' % (lx, rx)
 
 
@@ -997,7 +970,7 @@ class CValueBitwiseXor(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=1))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=1))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=1)))
 		return '%s ^ %s' % (lx, rx)
 
 
@@ -1012,7 +985,7 @@ class CValueBitwiseOr(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=2))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=2))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=2)))
 		return '%s | %s' % (lx, rx)
 
 
@@ -1027,7 +1000,7 @@ class CValueLogicalAnd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s && %s' % (lx, rx)
 
 
@@ -1042,7 +1015,7 @@ class CValueLogicalOr(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=1))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=1))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=1)))
 		return '%s || %s' % (lx, rx)
 
 
@@ -1109,7 +1082,7 @@ class CValueStringConcat(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return lx + ' ' + rx
 
 

{cshape-0.2.1 → cshape-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cshape"
-version = "0.2.1"
+version = "0.2.2"
 description = "A dependency-free C AST + printer: build a tree in Python, get C11 source back"
 readme = "README.md"
 license = "MIT"

{cshape-0.2.1 → cshape-0.2.2}/tests/test_smoke.py

@@ -1,8 +1,9 @@
 import unittest
 
 from cshape import (
-	CField, CStmtBlock, CStmtDefFunc, CStmtReturn, CTypeFunction, CTypeIdentifier,
-	CValueAdd, CValueIdentifier, render,
+	CField, CStmtBlock, CStmtDefFunc, CStmtDefVar, CStmtReturn, CTypeArray,
+	CTypeFunction, CTypeIdentifier, CValueAdd, CValueArray, CValueIdentifier,
+	CValueInteger, render,
 )
 
 
@@ -36,6 +37,21 @@ class SmokeTest(unittest.TestCase):
 		v.mark = 'debug-note'
 		self.assertIn('/*debug-note*/', render(v))
 
+	def test_value_constructor_accepts_nl_for_array_layout(self):
+		array_def = CStmtDefVar(
+			id='numbers',
+			type=CTypeArray(CTypeIdentifier('int')),
+			initializer=CValueArray([
+				CValueInteger(1, nl=1),
+				CValueInteger(2),
+			]),
+		)
+
+		self.assertEqual(
+			render(array_def).strip(),
+			'int numbers[] = {\n\t1, 2\n};',
+		)
+
 
 if __name__ == '__main__':
 	unittest.main()